X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=246647f67e28b0c5916e9de6f675f36184aec902;hb=8df6314090cda53869d92a1526081fa01fe2080b;hp=5070f58fe7eee63c53abecf366c86d81db3fe49f;hpb=2b0f9af025fc652a215f047ac6b79196d2ea4a95;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 5070f58..246647f 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -22,19 +22,52 @@ fi function cleanup() { - test "$OPTION_DEBUG" || exec 2>/dev/null >/dev/null test -z "$is_started" || return 0 + + if test "$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 +(${INITCMD_START[@]}) failed. + +Common causes are: +* /etc/rc.d/rc on Fedora Core 1 and RH9 fails always; the 'apt-rpm' build + method knows how to deal with this, but on existing installations, + appending 'true' to this file will help." + fi + + if test "$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 + +is recommended to fix this." + else + warning $" + +Failed to start vserver '$VSERVER_NAME'" + fi + + test "$OPTION_DEBUG" || exec 2>/dev/null >/dev/null test -z "$is_mounted" || umountVserver "$VSERVER_DIR" || : test -z "$have_interfaces" || disableInterfaces "$VSERVER_DIR" || : } +is_configured= +is_executed= is_started= is_mounted= +is_vshelper_init= have_interfaces= +set -e trap "cleanup" EXIT -set -e +vshelper.doSanityCheck + generateOptions "$VSERVER_DIR" execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" prepre-start enableInterfaces "$VSERVER_DIR" && have_interfaces=1 @@ -47,14 +80,18 @@ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start cd "$VSERVER_DIR"/vdir/ +is_configured=1 if $_VSERVER_INFO - FEATURE migrate; then $_CHBIND "${CHBIND_OPTS[@]}" -- \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ + $_VSCHED --xid self "${OPTS_VSCHED[@]}" -- \ $_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 @@ -65,10 +102,15 @@ else $_SAVE_CTXINFO "$VSERVER_DIR" \ $_CLEARENV \ $_CAPCHROOT "${CAPCHROOT_OPTS[@]}" . \ - ${INITCMD_START[@]} + "${INITCMD_START[@]}" fi +is_executed=1 "${INITCMD_START_SYNC[@]}" execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" post-start + +is_vshelper_init=1 +! vshelper.isEnabled "$VSERVER_DIR" || vshelper.doInit "$VSERVER_DIR" + is_started=1