# 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"
{
set +e
- test -z "$startsync_pipe" || rm -f "$startsync_pipe"
+ 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
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
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" || :
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
-vshelper.doSanityCheck
+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
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 -- \
$_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
- 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[@]} \