X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.suexec;h=eede669d73c1fa4b5c3d2fb37b020c574f32f25e;hb=d94953ada7c437e54f1570ef3da93db77f81aa76;hp=f249df3195febf843072f1f829c216875e59b474;hpb=1dd534f9534eeda713ba543170ba954e56a95c07;p=util-vserver.git diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index f249df3..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 @@ -34,28 +35,34 @@ test -z "$OPTION_NONAMESPACE" || USE_VNAMESPACE= if $_VSERVER_INFO - FEATURE migrate; then if test -z "$is_stopped"; then exec \ + "${IONICE_CMD[@]}" \ "${NICE_CMD[@]}" \ "${CHBIND_CMD[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ ${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 exec \ + "${IONICE_CMD[@]}" \ "${NICE_CMD[@]}" \ "${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 exec \ + "${IONICE_CMD[@]}" \ "${NICE_CMD[@]}" \ "${CHBIND_CMD[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \