X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build;h=efe1117b6d6c2cf3daf0dbd340aa0e50c53091da;hb=e2770a5bfa046e037e4e4feddef4fd4750389033;hp=29b4ca5dfb6074c9d703d79a6ff380eccb867e8c;hpb=fce1e0cba56c8f1b7ea829f68fcbd77caa054dd1;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build b/util-vserver/scripts/vserver-build index 29b4ca5..efe1117 100755 --- a/util-vserver/scripts/vserver-build +++ b/util-vserver/scripts/vserver-build @@ -18,7 +18,7 @@ : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." >&2 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -32,14 +32,14 @@ function showHelp() { echo \ $"Usage: $(basename $0) -m -n --force * - --rootdir --pkgcfgbase [--] * + --rootdir --pkgbase [--] * Options: --force ... remove/rename already existing vservers with the same name -m ... use method ; see below for possible values --rootdir ... [default: $DEFAULT_VSERVERDIR] - --pkgcfgbase + --pkgbase ... [default: $DEFAULT_VSERVERPKGDIR] cfg-options are: $SETUP_HELPMSG @@ -56,7 +56,7 @@ Possible methods are: skeleton ... -- [ *] ... installs a minimal skeleton filesystem, creates the configuration file and calls an optional command then - debootstrap ... -- -d [-m ] + debootstrap ... -- -d [-m ] [-- *] bootstraps the vserver with Debian's 'debootstrap' package Please report bugs to $PACKAGE_BUGREPORT" @@ -80,7 +80,7 @@ the GNU General Public License. This program has absolutely no warranty." set -e declare -a default_opts=() -test "$NO_DEFAULT_OPTS" || getFileArray default_opts "$CONFDIR/.defaults/apps/build/options" +test "$NO_DEFAULT_OPTS" || getFileArray default_opts "$CONFDIR/.defaults/apps/build/options" || : tmp=$(getopt -o +m:n: --long force,debug,help,version,rootdir:,pkgbase:,$SETUP_OPTIONS -n "$(basename $0)" -- \ "${default_opts[@]}" "$@") || exit 1