X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=2d16ac3306afde53031b727a988d72146b6be9d7;hb=ec854d5cb53d4cf8a899de40199aadb5dc72c461;hp=b66e054333f17fa20f870983a4f9fed807becd80;hpb=1171042cfba2870d05f6dcc771f6331fb5c9ad78;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index b66e054..2d16ac3 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. if isVserverRunning "$VSERVER_DIR"; then - echo $"vserver '$VSERVER_NAME' already running; aborting..." + echo $"vserver '$VSERVER_NAME' already running; aborting..." >&2 exit 1 fi @@ -32,12 +32,26 @@ 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 \ + $_VUNAME --dir "$VSERVER_DIR"/uts --missingok \ + $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" \ + $_VCONTEXT --migrate-self --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" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_START[@]}" + "$_CLEARENV" \ + "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . \ + -- "${INITCMD_START[@]}" +fi "${INITCMD_START_SYNC[@]}"