X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.suexec;h=eede669d73c1fa4b5c3d2fb37b020c574f32f25e;hb=a3093bf7ba9e93056bd6aabb30ed0d20210c345c;hp=02aeef23bb5b859ac136fcbebde985516918855f;hpb=36171922c7107ef4fb2ed9101d0dca58a43b5615;p=util-vserver.git diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index 02aeef2..eede669 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 @@ -41,7 +42,7 @@ if $_VSERVER_INFO - FEATURE migrate; then ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ $_VSPACE --enter "$S_CONTEXT" "${OPTS_VSPACE[@]}" -- \ $_VTAG --migrate "${OPTS_VTAG_ENTER[@]}" --silent -- \ - $_VCONTEXT $SILENT_OPT --migrate --chroot \ + $_VCONTEXT $SILENT_OPT --migrate $OPT_VCONTEXT_CHROOT \ --xid "$S_CONTEXT" --uid "$user" "${OPTS_VCONTEXT_ENTER[@]}" -- \ "$@" else @@ -51,10 +52,12 @@ if $_VSERVER_INFO - FEATURE migrate; then "${CHBIND_CMD[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ $_VTAG --create "${OPTS_VTAG_CREATE[@]}" --silent -- \ + $_VSPACE --new "${OPTS_VSPACE[@]}" ${USE_VNAMESPACE:+--mount --fs} -- \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ - $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ + $_VSPACE --set "${OPTS_VSPACE[@]}" ${USE_VNAMESPACE:+--mount --fs} -- \ + $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ - $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT -- \ + $_VCONTEXT --migrate-self --endsetup $OPT_VCONTEXT_CHROOT $SILENT_OPT -- \ "$@" fi else