X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=d67c7a11b9babb6c821adb51239e6b0d28c5e9f8;hb=e035f164c858115c488d0f2fc1e0d356a9096996;hp=d1e4f423e940b20a02cf9ae55e1a7d4e6f65f197;hpb=419716c5d7d33cf7a48535fa4bfe34f2beafb77e;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index d1e4f42..d67c7a1 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -32,13 +32,25 @@ cd "$VSERVER_DIR"/vdir/ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start cd "$VSERVER_DIR"/vdir/ -"${NICE_CMD[@]}" \ + +if $_VSERVER_INFO - FEATURE migrate; then + $_CHBIND "${CHBIND_OPTS[@]}" \ + $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" \ + ${USE_VNAMESPACE:+$_VNAMESPACE --set} \ + $_VLIMIT --dir "$VSERVER_DIR/rlimits" --missingok \ + $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" \ + $_VCONTEXT --migrate --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" \ + -- "${INITCMD_START[@]}" +else + "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" "${CHCONTEXT_INIT_OPTS[@]}" \ "$_SAVE_CTXINFO" "$VSERVER_DIR" \ "$_CLEARENV" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_START[@]}" + "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . \ + -- "${INITCMD_START[@]}" +fi "${INITCMD_START_SYNC[@]}"