X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.start;h=1ade9465c72c0aad7319c33d00e3a3d59dff2f27;hb=63083b4ea0b6bba6c354c6df0ee745b21307b7da;hp=3ba7fb6182e5e11374a0faa4da264473995c68b6;hpb=a39c4f55f865d1294a5e11c93b3d9c783b547eff;p=util-vserver.git diff --git a/scripts/vserver.start b/scripts/vserver.start index 3ba7fb6..1ade946 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; @@ -132,10 +133,12 @@ if $_VSERVER_INFO - FEATURE migrate; then $_CHBIND "${CHBIND_OPTS[@]}" -- \ $_EXEC_ULIMIT "$VSERVER_DIR"/ulimits \ $_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[@]}" -- \ @@ -152,7 +155,7 @@ else fi ${NICE_CMD[@]} \ - $_CHBIND_COMPAT "${CHBIND_OPTS[@]}" \ + $_CHBIND "${CHBIND_OPTS[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" "${CHCONTEXT_INIT_OPTS[@]}" \ $_SAVE_CTXINFO "$VSERVER_DIR" \