From: Daniel Hokka Zakrisson Date: Tue, 22 Jan 2008 09:19:57 +0000 (+0000) Subject: Fix vspace stuff. X-Git-Tag: release-0.30.215~38 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f48776091c9b8d3c0a203f4525ffdbfc7850e1ca;p=util-vserver.git Fix vspace stuff. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2669 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/scripts/vserver.stop b/scripts/vserver.stop index c5ee593..51b9178 100644 --- a/scripts/vserver.stop +++ b/scripts/vserver.stop @@ -80,7 +80,7 @@ if test -n "$_IS_FAKEINIT" && \ elif $_VSERVER_INFO - FEATURE migrate; then "${NICE_CMD[@]}" \ "${CHBIND_CMD[@]}" \ - "$_VSPACE" --enter --xid "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ + "$_VSPACE" --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ "$_VTAG" --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" -- \ "${INITCMD_STOP[@]}" || fail=1 diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index dcb7ebf..8114145 100644 --- a/scripts/vserver.suexec +++ b/scripts/vserver.suexec @@ -38,7 +38,7 @@ if $_VSERVER_INFO - FEATURE migrate; then "${CHBIND_CMD[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ - $_VSPACE --enter --xid "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ + $_VSPACE --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ $_VTAG --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ $_VCONTEXT $SILENT_OPT --migrate --chroot \ --xid "$S_CONTEXT" --uid "$user" "${OPTS_VCONTEXT_ENTER[@]}" -- \ diff --git a/src/vspace.c b/src/vspace.c index 940255f..c3c0e73 100644 --- a/src/vspace.c +++ b/src/vspace.c @@ -205,8 +205,6 @@ int main(int argc, char *argv[]) WRITE_MSG(2, "No operation was specified; try '--help' for more information\n"); else if (sum>1) WRITE_MSG(2, "Can not specify multiple operations; try '--help' for more information\n"); - else if (mask==0) - WRITE_MSG(2, "Must specify at least one space; try '--help' for more information\n"); else if (optind==argc && (do_new || do_enter)) WRITE_MSG(2, "No command specified; try '--help' for more information\n"); else {