X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=0c053ec2e928db91252728ca670c8dab386daf2c;hb=90d34fc8fd33eb78a83470e48d20053bd1617179;hp=bd7a960559d7ccf22e3b6142dc5b4d720d644971;hpb=153e4c964b0eaf37831568c1f01d8e872298673a;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index bd7a960..0c053ec 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -16,27 +16,61 @@ # 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 +function cleanup() +{ + test "$OPTION_DEBUG" || exec 2>/dev/null >/dev/null + test -z "$is_started" || return 0 + test -z "$is_mounted" || umountVserver "$VSERVER_DIR" || : + test -z "$have_interfaces" || disableInterfaces "$VSERVER_DIR" || : +} + +is_started= +is_mounted= +have_interfaces= + +trap "cleanup" EXIT + +set -e generateOptions "$VSERVER_DIR" execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" prepre-start -enableInterfaces "$VSERVER_DIR" +enableInterfaces "$VSERVER_DIR" && have_interfaces=1 -mountVserver "$VSERVER_DIR" +mountVserver "$VSERVER_DIR" && is_mounted=1 prepareInit "$VSERVER_DIR" cd "$VSERVER_DIR"/vdir/ - execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start -"${NICE_CMD[@]}" \ - "$_CHBIND" "${CHBIND_OPTS[@]}" \ - "$_CHCONTEXT" "${CHCONTEXT_DISCONNECT[@]}" "${CHCONTEXT_OPTS[@]}" \ - "$_SAVE_CTXINFO" "$VSERVER_DIR" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_START[@]}" +cd "$VSERVER_DIR"/vdir/ + +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 --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ + "${VSERVER_EXTRA_CMDS[@]}" \ + $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ + $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ + $_SAVE_CTXINFO "$VSERVER_DIR" \ + $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ + "${INITCMD_START[@]}" +else + ${NICE_CMD[@]} \ + $_CHBIND "${CHBIND_OPTS[@]}" \ + $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ + $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" "${CHCONTEXT_INIT_OPTS[@]}" \ + $_SAVE_CTXINFO "$VSERVER_DIR" \ + $_CLEARENV \ + $_CAPCHROOT "${CAPCHROOT_OPTS[@]}" . \ + "${INITCMD_START[@]}" +fi "${INITCMD_START_SYNC[@]}" execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" post-start +is_started=1