From: Daniel Hokka Zakrisson Date: Sun, 24 Sep 2006 17:44:24 +0000 (+0000) Subject: This check was correct the first time, (cond)restart just calls stop and start, so... X-Git-Tag: release-0.30.211~26 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f3492f2efc06d1b5727f2916f84ace4d50794e5;p=util-vserver.git This check was correct the first time, (cond)restart just calls stop and start, so we need not handle them specifically. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2329 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/scripts/vserver b/scripts/vserver index 3aee7c8..e3f1484 100755 --- a/scripts/vserver +++ b/scripts/vserver @@ -200,7 +200,7 @@ 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 -a "$2" != restart -a "$2" != condrestart || \ +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[@]}"