X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=27ae30d1b9cf1292de22fd3f33db6d051986ae06;hb=746a16651a2b38b02c4ebc528e73acc388eddcc2;hp=2d16ac3306afde53031b727a988d72146b6be9d7;hpb=efad4aea08dc43aa803738bd83b08392ec37f78b;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 2d16ac3..27ae30d 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -20,12 +20,26 @@ if isVserverRunning "$VSERVER_DIR"; then 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/ @@ -34,25 +48,27 @@ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-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 --dir "$VSERVER_DIR"/uts --missingok \ - $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" \ - $_VCONTEXT --migrate-self --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" \ - -- "${INITCMD_START[@]}" + $_CHBIND "${CHBIND_OPTS[@]}" -- \ + $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ + ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ + $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ + $_VUNAME --dir "$VSERVER_DIR"/uts --missingok -- \ + $_VUNAME --set --context -- "$VSERVER_DIR" \ + $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" --flag !setup -- \ + $_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" \ - "$_CLEARENV" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . \ - -- "${INITCMD_START[@]}" + ${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