: ${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"
set +e
OPTIONS_ORIG=( "$@" )
-tmp=$(getopt -o +sv --long nonamespace,--nonamespace,--insecure,help,debug,version,sync,verbose,silent -n "$0" -- "$@") || exit 1
+tmp=$(getopt -o +sv --long nonamespace,--nonamespace,--insecure,defaulttty,help,debug,version,sync,verbose,silent -n "$0" -- "$@") || exit 1
eval set -- "$tmp"
OPTION_FORCE_SYNC=
OPTION_DEBUG=
OPTION_NONAMESPACE=
OPTION_INSECURE=
+OPTION_DEFAULTTTY=
while true; do
case "$1" in
(-s|--sync) OPTION_FORCE_SYNC=$1;;
(--silent) OPTION_SILENT=$1;;
(----nonamespace)OPTION_NONAMESPACE=$1;;
+ (--defaulttty) OPTION_DEFAULTTTY=$1;;
(----insecure) OPTION_INSECURE=1;;
(--) shift; break;;
(*) echo $"vserver: internal error; arg=='$1'" >&2; exit 1;;
shift
done
-OPTION_ALL=( $OPTION_SILENT $OPTION_VERBOSE $OPTION_DEBUG )
+OPTION_ALL=( $OPTION_SILENT $OPTION_VERBOSE $OPTION_DEBUG $OPTION_DEFAULTTTY )
SELF=( "$0" "${OPTION_ALL[@]}" )
vserver=$1
;;
esac
-if test "$allow_legacy"; then
+if test -n "$allow_legacy"; then
do_legacy=
test ! -e "$VSERVER_DIR/legacy" || do_legacy=1
test -d "$VSERVER_DIR" -o ! -e "$CONFDIR/$vserver.conf" || do_legacy=1
test -d "$VSERVER_DIR" || {
echo $"\
-Can not find vserver-setup; please make sure that the vserver configuration
-is located at $VSERVER_DIR/."
- exit 1
+Can not find a vserver-setup at '$VSERVER_DIR/'.
+
+Possible solutions:
+* fix the spelling of the '$vserver' vserver name
+* read 'vserver $vserver build --help' about ways to create a new vserver
+* see 'vserver --help' for the syntax of this command
+"
+ exit 5
} >&2
if test -e "$VSERVER_DIR"/name; then
VSERVER_NAME=$(basename "$VSERVER_DIR")
fi
-test "$2" != start -o "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \
+test "$2" != start -o -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \
exec $_VNAMESPACE --new -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}"
. $PKGLIBDIR/vserver.functions
(pkgmgmt)
op=$3
shift 3
- exec $_PKGMGMT ${op:+--$op} "$@" -- "$vserver"
+ exec $_VNAMESPACE --new -- $_PKGMGMT ${op:+--$op} "$@" -- "$vserver"
;;
(apt-get|apt-config|apt-cache)
fi
exit 0
else
- msg $"Vserver '$vserver' is not running"
- exit 1
+ msg $"Vserver '$vserver' is stopped"
+ exit 3
fi
;;
(*)