diff options
Diffstat (limited to 'trunk/src')
| -rwxr-xr-x | trunk/src/mkjail | 3 | ||||
| -rwxr-xr-x | trunk/src/templatepkg | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/trunk/src/mkjail b/trunk/src/mkjail index f6c935c..b45cdd5 100755 --- a/trunk/src/mkjail +++ b/trunk/src/mkjail @@ -101,7 +101,8 @@ else fi fi -echo "$BASENAME: instaling packages into $JAIL_ROOT/$server using $TEMPLATE..." +echo "Instaling packages into $JAIL_ROOT/$server..." +echo "Using template: $TEMPLATE." install_packages copy_template_files $JAIL_ROOT/$server diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg index a8045ee..ad7306f 100755 --- a/trunk/src/templatepkg +++ b/trunk/src/templatepkg @@ -384,11 +384,11 @@ function template_update { if [ -f $TEMPLATE ]; then if ! `grep -v -e "^#" $TEMPLATE | cut -d : -f 1 | awk '{ print $1 }' | grep -q -e "^$pack\$"`; then echo $pack >> $TEMPLATE - echo Added $pack # on $TEMPLATE + echo Adding $pack # on $TEMPLATE fi else echo $pack >> $TEMPLATE - echo Added $pack # on $TEMPLATE + echo Adding $pack # on $TEMPLATE fi done @@ -409,7 +409,7 @@ function template_update { sed "/^$pack$/d" $TEMPLATE | sed "/^$pack $/d" | sed "/^$pack:*/d" | sed "/^$pack */d" > $TEMPLATE.tmp cat $TEMPLATE.tmp > $TEMPLATE rm -f $TEMPLATE.tmp - echo Removed $pack # from $TEMPLATE + echo Removing $pack # from $TEMPLATE fi fi |