diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-02-11 19:55:23 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2007-02-11 19:55:23 +0000 |
| commit | f5ddefdbd8118f70eb457566de06c16daf5834fd (patch) | |
| tree | 793cdeb5e3a971824ad222cefbe51ed702d8e69b /trunk/src | |
| parent | 6fa49c9dd9c53c0e930a49e91548002f1098bd29 (diff) | |
| download | simplepkg-f5ddefdbd8118f70eb457566de06c16daf5834fd.tar.gz simplepkg-f5ddefdbd8118f70eb457566de06c16daf5834fd.tar.bz2 | |
mkjail: change script order: jailist update now happens before post-install scripts
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@184 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src')
| -rwxr-xr-x | trunk/src/metapkg | 9 | ||||
| -rwxr-xr-x | trunk/src/mkjail | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/trunk/src/metapkg b/trunk/src/metapkg index e83ee4d..d86807e 100755 --- a/trunk/src/metapkg +++ b/trunk/src/metapkg @@ -22,10 +22,11 @@ # COMMON="/usr/libexec/simplepkg/common.sh" +BASENAME="`basename $0`" ROOT="/" function usage { - echo "usage: [ROOT=/otherroot] `basename $0` --option [metapackage]" + echo "usage: [ROOT=/otherroot] $BASENAME --option [metapackage]" echo "options: --install, --remove" exit 1 } @@ -40,7 +41,7 @@ fi if [ -z "$2" ]; then usage else - eval_config `basename $0` -u + eval_config $BASENAME -u fi if [ ! -f "$BASE_CONF/$2.template" ]; then @@ -51,9 +52,9 @@ else unset server fi -if [[ "$1" == "--install" ]]; then +if [ "$1" == "--install" ] || [ "$1" == "install" ]; then install_packages -elif [[ "$1" == "--remove" ]]; then +elif [ "$1" == "--remove" ] || [ "$1" == "remove" ]; then remove_packages else usage diff --git a/trunk/src/mkjail b/trunk/src/mkjail index a79bfe6..14b50c9 100755 --- a/trunk/src/mkjail +++ b/trunk/src/mkjail @@ -140,8 +140,8 @@ echo "$BASENAME: instaling packages into $JAIL_ROOT/$server using $TEMPLATE..." install_packages copy_template_files $JAIL_ROOT/$server set_jail_perms $JAIL_ROOT/$server -exec_post_install_scripts $JAIL_ROOT $server jailist_update $JAIL_ROOT/$server +exec_post_install_scripts $JAIL_ROOT $server echo $BASENAME: done creating $server jail |