X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.suexec;h=dce9be91b96fdd14c60174fecf8a5f627ee73c51;hb=909fa999c0180aba479959080bd434ad98930c49;hp=f6c9e78223bec87254f8cfff4a13404128536fa7;hpb=569b1bfe1e5954fa083532dc37d2fe7418ec2d4a;p=util-vserver.git diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index f6c9e78..dce9be9 100644 --- a/scripts/vserver.suexec +++ b/scripts/vserver.suexec @@ -22,7 +22,8 @@ test -z "$is_stopped" -o "$OPTION_INSECURE" || { exit 1 } generateOptions "$VSERVER_DIR" -addtoCPUSET "$VSERVER_DIR" +addtoCPUSET "$VSERVER_DIR" +attachToCgroup "$VSERVER_DIR" user=$1 shift @@ -39,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[@]}" -- \