X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=f3a8ff22918e0753cf4d6cc8b4c0e5df92c011dc;hb=d1f7d886a4cc0dcccafcd0fd7523bcedbc35ce27;hp=8f2c3b940e6386df3a17585ef65068df1f229ed8;hpb=50176d8eb0761d6b857bd82a9f2c29ef2fb33a33;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 8f2c3b9..f3a8ff2 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -15,17 +15,22 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +lock "$__LOCKDIR"/vserver."$($_VSERVER_INFO "$VSERVER_DIR" CANONIFY)".startup + if isVserverRunning "$VSERVER_DIR"; then - echo $"vserver '$VSERVER_NAME' already running; aborting..." >&2 - exit 1 + warning $"vserver '$VSERVER_NAME' already running" + exit 0 fi function cleanup() { - test -z "$startsync_pipe" || rm -f "$startsync_pipe" - test -z "$is_started" || return 0 + set +e - if test "$is_configured" -a -z "$is_executed"; then + test -z "$startsync_pipe" || $_RM -f "$startsync_pipe" + test -z "$is_started" || { unlock; return 0; } + + if test -n "$is_configured" -a -z "$is_executed"; then warning $" An error occured while executing the vserver startup sequence; when there are no other messages, it is very likely that the init-script @@ -37,13 +42,13 @@ Common causes are: appending 'true' to this file will help." fi - if test "$is_executed"; then + if test -n "$is_executed"; then warning $" An error occured after executing the vserver startup sequence. This means that some processes may exist in the created context and the manual execution of - $_VSERVER '$VSERVER_NAME' stop + $_VSERVER '$VSERVER_DIR' stop is recommended to fix this." else @@ -52,9 +57,11 @@ is recommended to fix this." Failed to start vserver '$VSERVER_NAME'" fi - test "$OPTION_DEBUG" || exec 2>/dev/null >/dev/null + test -n "$OPTION_DEBUG" || exec 2>/dev/null >/dev/null test -z "$is_mounted" || umountVserver "$VSERVER_DIR" || : test -z "$have_interfaces" || disableInterfaces "$VSERVER_DIR" || : + + unlock || : } is_configured= @@ -65,13 +72,27 @@ is_vshelper_init= have_interfaces= startsync_pipe= +while test "$#" -gt 0; do + case "$1" in + (--rescue) INITSTYLE=rescue;; + (--rescue-cmd) INITCMD_RESCUE=( $2 ); shift;; + (*) panic $"vserver ... start: unknown option '$1'";; + esac + shift +done + set -e trap "cleanup" EXIT -vshelper.doSanityCheck +sanityCheck "$VSERVER_DIR" +mountRootFS "$VSERVER_DIR" generateOptions "$VSERVER_DIR" + +pushd "$VSERVER_DIR" >/dev/null execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" prepre-start +popd + enableInterfaces "$VSERVER_DIR" && have_interfaces=1 mountVserver "$VSERVER_DIR" && is_mounted=1 @@ -81,11 +102,12 @@ pushd "$VSERVER_DIR"/vdir/ >/dev/null execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start popd >/dev/null -test -z "$OPTION_DEFAULTTTY" || setDefaultTTY +test -z "$OPTION_DEFAULTTTY" || setDefaultTTY "$VSERVER_DIR" pushd "$VSERVER_DIR"/vdir/ >/dev/null is_configured=1 if $_VSERVER_INFO - FEATURE migrate; then + ${NICE_CMD[@]} \ $_CHBIND "${CHBIND_OPTS[@]}" -- \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ @@ -96,13 +118,15 @@ if $_VSERVER_INFO - FEATURE migrate; then $_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[@]}" -- \ + $_ENV -i -- \ + $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT \ + "${OPTS_VCONTEXT_MIGRATE[@]}" "${OPTS_VCONTEXT_ENTER[@]}" -- \ "${INITCMD_START[@]}" else - if test "$_IS_FAKEINIT"; then - startsync_pipe=$(mktemp /tmp/vserver-start.XXXXXX) - rm -f "$startsync_pipe" - mkfifo -m600 "$startsync_pipe" ## safe, since mkfifo does not follow symlinks + if test -n "$_IS_FAKEINIT"; then + startsync_pipe=$($_MKTEMP /tmp/vserver-start.XXXXXX) + $_RM -f "$startsync_pipe" + $_MKFIFO -m600 "$startsync_pipe" ## safe, since mkfifo does not follow symlinks fi ${NICE_CMD[@]} \ @@ -110,7 +134,7 @@ else $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" "${CHCONTEXT_INIT_OPTS[@]}" \ $_SAVE_CTXINFO "$VSERVER_DIR" \ - $_CLEARENV \ + $_ENV -i -- \ $_CHAINECHO "${_IS_FAKEINIT:+$startsync_pipe}" "" \ $_CAPCHROOT "${CAPCHROOT_OPTS[@]}" . \ "${INITCMD_START[@]}"