X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.start;h=25b4767f11d9a439fb30c79832afca32431cb61f;hb=52dfff5433ea99e7427e781a1db43b68cbfe9243;hp=e1c53799737f9600726f3c8e93ba51b1c0ff73ee;hpb=70649cce641c8ff229915dac171bf4b6fdef518e;p=util-vserver.git diff --git a/scripts/vserver.start b/scripts/vserver.start index e1c5379..25b4767 100644 --- a/scripts/vserver.start +++ b/scripts/vserver.start @@ -105,6 +105,8 @@ pushd "$VSERVER_DIR" >/dev/null execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" initialize popd >/dev/null +fsckAllFS "$VSERVER_DIR" + mountRootFS "$VSERVER_DIR" generateOptions "$VSERVER_DIR" @@ -116,9 +118,11 @@ setDiskLimits "$VSERVER_DIR" enableInterfaces "$VSERVER_DIR" && have_interfaces=1 -mountVserver "$VSERVER_DIR" && is_mounted=1 -prepareInit "$VSERVER_DIR" -addtoCPUSET "$VSERVER_DIR" +mountVserver "$VSERVER_DIR" && is_mounted=1 +prepareInit "$VSERVER_DIR" +addtoCPUSET "$VSERVER_DIR" + +handleDeviceMap --set "$S_CONTEXT" "$VSERVER_DIR/apps/vdevmap" pushd "$VSERVER_DIR"/vdir/ >/dev/null execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start @@ -130,13 +134,20 @@ pushd "$VSERVER_DIR"/vdir/ >/dev/null is_configured=1 if $_VSERVER_INFO - FEATURE migrate; then ${NICE_CMD[@]} \ - $_CHBIND "${CHBIND_OPTS[@]}" -- \ + "${CHBIND_CMD[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR"/ulimits \ + $_VTAG --create "${OPTS_VTAG_CREATE[@]}" --silent -- \ + $_VSPACE --new "${OPTS_VSPACE[@]}" -- \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ + ${OPTION_STRACE:+$_STRACE -fF -o /tmp/vserver-start.$$} \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ + $_VSPACE --set "${OPTS_VSPACE[@]}" -- \ + $_EXEC_REMOUNT -- \ $_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 -- \ + $_VMEMCTRL --xid self --set "${OPTS_VMEMCTRL[@]}" -- \ "${VSERVER_EXTRA_CMDS[@]}" \ $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ @@ -153,7 +164,7 @@ else fi ${NICE_CMD[@]} \ - $_CHBIND "${CHBIND_OPTS[@]}" \ + "${CHBIND_CMD[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" "${CHCONTEXT_INIT_OPTS[@]}" \ $_SAVE_CTXINFO "$VSERVER_DIR" \