From 88ae6bc46b184cb3bbbcae88c2c4484082be641a Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Thu, 8 Jul 2010 18:51:54 +0000 Subject: [PATCH 1/1] Use the shared spaces everywhere but rescue. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2895 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- scripts/vserver.start | 2 +- scripts/vserver.stop | 2 +- scripts/vserver.suexec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/vserver.start b/scripts/vserver.start index 7945aca..729d6ac 100644 --- a/scripts/vserver.start +++ b/scripts/vserver.start @@ -144,7 +144,7 @@ if $_VSERVER_INFO - FEATURE migrate; then ${OPTION_STRACE:+$_STRACE -fF -o /tmp/vserver-start.$$} \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ "${VSPACE_SHARED_CMD[@]}" \ - $_VSPACE --set "${OPTS_VSPACE[@]}" -- \ + $_VSPACE --set "${OPTS_VSPACE[@]}" "${OPTS_VSPACE_SHARED[@]}" -- \ $_EXEC_REMOUNT /proc /sys -- \ $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ $_VSCHED --xid self --force "${OPTS_VSCHED[@]}" -- \ diff --git a/scripts/vserver.stop b/scripts/vserver.stop index d5c939e..55aedb3 100644 --- a/scripts/vserver.stop +++ b/scripts/vserver.stop @@ -83,7 +83,7 @@ elif $_VSERVER_INFO - FEATURE migrate; then "${IONICE_CMD[@]}" \ "${NICE_CMD[@]}" \ "${CHBIND_CMD[@]}" \ - "$_VSPACE" --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ + "$_VSPACE" --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" "${OPTS_VSPACE_SHARED[@]}" -- \ "$_VTAG" --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ $_VCONTEXT $SILENT_OPT --migrate $OPT_VCONTEXT_CHROOT --xid "$S_CONTEXT" -- \ "${INITCMD_STOP[@]}" || fail=1 diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index eede669..dce9be9 100644 --- a/scripts/vserver.suexec +++ b/scripts/vserver.suexec @@ -40,7 +40,7 @@ if $_VSERVER_INFO - FEATURE migrate; then "${CHBIND_CMD[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ - $_VSPACE --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ + $_VSPACE --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" "${OPTS_VSPACE_SHARED[@]}" -- \ $_VTAG --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ $_VCONTEXT $SILENT_OPT --migrate $OPT_VCONTEXT_CHROOT \ --xid "$S_CONTEXT" --uid "$user" "${OPTS_VCONTEXT_ENTER[@]}" -- \ -- 1.8.1.5