vserver=$1
cmd=$2
-test "$cmd" != build || { shift 2; exec "$_VSERVER_BUILD" -n "$vserver" "$@"; }
+test "$cmd" != build || { shift 2; exec $_VNAMESPACE --new -- "$_VSERVER_BUILD" -n "$vserver" "$@"; }
allow_legacy=
VSERVER_NAME=$(basename "$VSERVER_DIR")
fi
+# Create a new namespace when starting the guest
test "$2" != start -o -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \
exec $_VNAMESPACE --new -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}"
+# Enter the namespace early so we can test for files inside the guest
+test "$2" != enter -a "$2" != stop || \
+ test -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \
+ ! isVserverRunning "$VSERVER_DIR" || \
+ exec $_VNAMESPACE --enter "$VSERVER_DIR" -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}"
+
. $__PKGLIBDIR/vserver.functions
case "$2" in
(start|stop|delete)
;;
(apt-get|apt-config|apt-cache)
- export _APT_GET=$2
+ export APT_GET=$2
shift 2
- exec $_VAPT_GET -- "$@"
+ exec $_VAPT_GET "$VSERVER_DIR" -- "$@"
;;
+
(rpm)
- exec $_VRPM -- "$@"
+ shift 2
+ exec $_VRPM "$VSERVER_DIR" -- "$@"
;;
(status)