diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-24 19:36:12 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-24 19:36:12 +0000 |
| commit | e7ef899faa3503b9e315bbcadaef0319f05efd56 (patch) | |
| tree | 229e9301f9810a3c4f41d49cbee982e313eb1491 /trunk | |
| parent | 6cab5d275ddcdbe3815b79a6af3cfb51933c3dfa (diff) | |
| download | simplepkg-e7ef899faa3503b9e315bbcadaef0319f05efd56.tar.gz simplepkg-e7ef899faa3503b9e315bbcadaef0319f05efd56.tar.bz2 | |
templatepkg and mkjail: minor changes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@534 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/doc/CHANGELOG | 1 | ||||
| -rwxr-xr-x | trunk/src/mkjail | 3 | ||||
| -rwxr-xr-x | trunk/src/templatepkg | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 9f5a359..79c7f63 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -4,6 +4,7 @@ simplepkg changelog 0.6pre31 ======== + - templatepkg and mkjail: minor changes - templates: - removed slackware and added slackware-12.1 - added slamd64-11.0, slamd64-12.0 and slamd64-12.1 templates 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 |