X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.start;h=63b02a941f5536890bb5de008597b9e02546aa59;hb=781214f92e4430e819906c698723e66f5def8883;hp=8b33dac6963ea9fec1cf2dc99ec8a1f0bbfe4bbe;hpb=bd9897c7ebcac63115654fea42009205f912d195;p=util-vserver.git diff --git a/scripts/vserver.start b/scripts/vserver.start index 8b33dac..63b02a9 100644 --- a/scripts/vserver.start +++ b/scripts/vserver.start @@ -83,6 +83,7 @@ inclusive its arguments to the cmdline." INITCMD_RESCUE=( $2 ); have_initcmd=1 shift;; + (--rescue-init) _IS_FAKEINIT=1;; (--) shift; break;; (-*) panic $"vserver ... start: unknown option '$1'";; (*) break; @@ -131,11 +132,14 @@ if $_VSERVER_INFO - FEATURE migrate; then ${NICE_CMD[@]} \ $_CHBIND "${CHBIND_OPTS[@]}" -- \ $_EXEC_ULIMIT "$VSERVER_DIR"/ulimits \ + $_VTAG --create "${OPTS_VTAG_CREATE[@]}" -- \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ + ${OPTION_STRACE:+$_STRACE -fF -o /tmp/vserver-start.$$} \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ $_VSCHED --xid self --force "${OPTS_VSCHED[@]}" -- \ - $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ + $_VSYSCTL --xid self --dir "$VSERVER_DIR"/sysctl --missingok -- \ + $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ "${VSERVER_EXTRA_CMDS[@]}" \ $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \