X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=a46b3f184df198d39d84ace4b24a049755d741ac;hb=dfa40e043f50b3ed0f89cdec01d0655c94c1e12e;hp=1c65eb8bbc27b2d5e5ec27ac2c21dd524810d231;hpb=b77c645592b1a03f017edc230c31b51c63c73f71;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 1c65eb8..a46b3f1 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. -lock "$LOCKDIR"/vserver."$($_VSERVER_INFO "$VSERVER_DIR" CANONIFY)".startup +lock "$__LOCKDIR"/vserver."$($_VSERVER_INFO "$VSERVER_DIR" CANONIFY)".startup if isVserverRunning "$VSERVER_DIR"; then warning $"vserver '$VSERVER_NAME' already running" @@ -30,7 +30,7 @@ function cleanup() test -z "$startsync_pipe" || $_RM -f "$startsync_pipe" test -z "$is_started" || { unlock; return 0; } - if test "$is_configured" -a -z "$is_executed"; then + 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 @@ -42,7 +42,7 @@ 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 @@ -57,7 +57,7 @@ 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" || : @@ -71,6 +71,29 @@ is_mounted= is_vshelper_init= have_interfaces= startsync_pipe= +have_initcmd= + +while test "$#" -gt 0; do + case "$1" in + (--rescue) INITSTYLE=rescue;; + (--rescue-cmd) + warning $"\ +The '--rescue-cmd' option is deprecated; just add the the initcmd +inclusive its arguments to the cmdline." + INITCMD_RESCUE=( $2 ); + have_initcmd=1 + shift;; + (--) shift; break;; + (-*) panic $"vserver ... start: unknown option '$1'";; + (*) break; + esac + shift +done + +if test x"$INITSTYLE" = xrescue -a -z "$have_initcmd" -a "$#" -gt 0; then + INITCMD_RESCUE=( "$@" ) +fi + set -e trap "cleanup" EXIT @@ -79,7 +102,11 @@ sanityCheck "$VSERVER_DIR" mountRootFS "$VSERVER_DIR" generateOptions "$VSERVER_DIR" + +pushd "$VSERVER_DIR" >/dev/null execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" prepre-start +popd >/dev/null + enableInterfaces "$VSERVER_DIR" && have_interfaces=1 mountVserver "$VSERVER_DIR" && is_mounted=1 @@ -95,7 +122,8 @@ pushd "$VSERVER_DIR"/vdir/ >/dev/null is_configured=1 if $_VSERVER_INFO - FEATURE migrate; then ${NICE_CMD[@]} \ - $_CHBIND "${CHBIND_OPTS[@]}" -- \ + $_CHBIND "${CHBIND_OPTS[@]}" -- \ + $_EXEC_ULIMIT "$VSERVER_DIR"/ulimits \ $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ @@ -106,10 +134,11 @@ if $_VSERVER_INFO - FEATURE migrate; then $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ $_SAVE_CTXINFO "$VSERVER_DIR" \ $_ENV -i -- \ - $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ + $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT \ + "${OPTS_VCONTEXT_MIGRATE[@]}" "${OPTS_VCONTEXT_ENTER[@]}" -- \ "${INITCMD_START[@]}" else - if test "$_IS_FAKEINIT"; then + 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