X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver;h=d72bea828edc042296a67a2e8e275d75fcb9d1ca;hb=fb1b131fb3e0ba481a7868359f8a2c91eb91def2;hp=545206d1f209f850eae92aab7f2d69741a1987b7;hpb=fe7d06dd8c87ef290962b1f14b9eb3e41d4a1f0d;p=util-vserver.git diff --git a/scripts/vserver b/scripts/vserver index 545206d..d72bea8 100755 --- a/scripts/vserver +++ b/scripts/vserver @@ -153,7 +153,7 @@ SELF=( "$0" "${OPTION_ALL[@]}" ) 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= @@ -227,7 +227,8 @@ case "$2" in suexec 0 chkconfig "$@" ;; (enter) - OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin ) + useVlogin && \ + OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin ) getEnterShell "$VSERVER_DIR" suexec 0 "${ENTER_SHELL[@]}" ;;