X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fvserver.start;h=385613f0a0d9c0d7656b940f91a28ffeee3d17a4;hb=fc28db1eb4146796ec27c2fb15780d6303120261;hp=731128828c23c6028dfdd71574bd66e35532c81f;hpb=8cf13bb177d92c93eb73dc8939777150536c2d00;p=util-vserver.git

diff --git a/scripts/vserver.start b/scripts/vserver.start
index 7311288..385613f 100644
--- a/scripts/vserver.start
+++ b/scripts/vserver.start
@@ -1,4 +1,4 @@
-# $Id: vserver.start,v 1.45 2005/07/15 19:01:06 ensc Exp $  --*- sh -*--
+# $Id: vserver.start 2389 2006-11-20 15:10:00Z dhozac $  --*- sh -*--
 
 # Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
@@ -71,21 +71,40 @@ is_mounted=
 is_vshelper_init=
 have_interfaces=
 startsync_pipe=
+have_initcmd=
 
 while test "$#" -gt 0; do
     case "$1" in
 	(--rescue)	INITSTYLE=rescue;;
-	(--rescue-cmd)	INITCMD_RESCUE=( $2 ); shift;;
-	(*)		panic $"vserver ... start: unknown option '$1'";;
+	(--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;;
+	(--rescue-init)	_IS_FAKEINIT=1;;
+	(--)		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
 
 sanityCheck      "$VSERVER_DIR"
 
+pushd "$VSERVER_DIR" >/dev/null
+execScriptlets   "$VSERVER_DIR" "$VSERVER_NAME" initialize
+popd >/dev/null
+
 mountRootFS      "$VSERVER_DIR"
 generateOptions  "$VSERVER_DIR"
 
@@ -93,10 +112,13 @@ pushd "$VSERVER_DIR" >/dev/null
 execScriptlets   "$VSERVER_DIR" "$VSERVER_NAME" prepre-start
 popd >/dev/null
 
+setDiskLimits    "$VSERVER_DIR"
+
 enableInterfaces "$VSERVER_DIR" && have_interfaces=1
 
 mountVserver "$VSERVER_DIR"     && is_mounted=1
 prepareInit  "$VSERVER_DIR"
+addtoCPUSET  "$VSERVER_DIR"
 
 pushd "$VSERVER_DIR"/vdir/ >/dev/null
 execScriptlets   "$VSERVER_DIR" "$VSERVER_NAME" pre-start
@@ -113,29 +135,29 @@ if $_VSERVER_INFO - FEATURE migrate; then
     $_VCONTEXT   --create "${OPTS_VCONTEXT_CREATE[@]}" -- \
     ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \
     $_VLIMIT     --dir "$VSERVER_DIR"/rlimits --missingok -- \
-    $_VSCHED     --xid self "${OPTS_VSCHED[@]}" -- \
+    $_VSCHED     --xid self --force "${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" \
-    $_ENV -i -- \
+    $_ENV -i "${OPTS_ENV[@]}" \
     $_VCONTEXT   --migrate-self --endsetup --chroot $SILENT_OPT \
     "${OPTS_VCONTEXT_MIGRATE[@]}" "${OPTS_VCONTEXT_ENTER[@]}" -- \
     "${INITCMD_START[@]}"
 else
     if test -n "$_IS_FAKEINIT"; then
-	startsync_pipe=$($_MKTEMP /tmp/vserver-start.XXXXXX)
+	startsync_pipe=$($_MKTEMP vserver-start.XXXXXX)
 	$_RM -f "$startsync_pipe"
 	$_MKFIFO -m600 "$startsync_pipe"	## safe, since mkfifo does not follow symlinks
     fi
     
     ${NICE_CMD[@]} \
-    $_CHBIND           "${CHBIND_OPTS[@]}" \
+    $_CHBIND_COMPAT    "${CHBIND_OPTS[@]}" \
     $_EXEC_ULIMIT      "$VSERVER_DIR/ulimits" \
     $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" "${CHCONTEXT_INIT_OPTS[@]}" \
     $_SAVE_CTXINFO     "$VSERVER_DIR" \
-    $_ENV -i -- \
+    $_ENV -i "${OPTS_ENV[@]}" \
     $_CHAINECHO "${_IS_FAKEINIT:+$startsync_pipe}" "" \
     $_CAPCHROOT        "${CAPCHROOT_OPTS[@]}" . \
     "${INITCMD_START[@]}"