X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=27ae30d1b9cf1292de22fd3f33db6d051986ae06;hb=746a16651a2b38b02c4ebc528e73acc388eddcc2;hp=199596c503e79d097dc8bb9467f9ec83defff082;hpb=b540342aa139af3850c2c645687e17631440fe71;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 199596c..27ae30d 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -22,9 +22,10 @@ fi function cleanup() { + test "$OPTION_DEBUG" || exec 2>/dev/null >/dev/null test -z "$is_started" || return 0 - test -z "$is_mounted" || umountVserver "$VSERVER_DIR" &>/dev/null || : - test -z "$have_interfaces" || disableInterfaces "$VSERVER_DIR" &>/dev/null || : + test -z "$is_mounted" || umountVserver "$VSERVER_DIR" || : + test -z "$have_interfaces" || disableInterfaces "$VSERVER_DIR" || : } is_started= @@ -47,14 +48,15 @@ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start cd "$VSERVER_DIR"/vdir/ if $_VSERVER_INFO - FEATURE migrate; then - $_CHBIND "${CHBIND_OPTS[@]}" \ - $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" \ - ${USE_VNAMESPACE:+$_VNAMESPACE --set} \ - $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok \ - $_VUNAME --dir "$VSERVER_DIR"/uts --missingok \ - $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" \ - $_VCONTEXT --migrate-self --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" \ - -- "${INITCMD_START[@]}" + $_CHBIND "${CHBIND_OPTS[@]}" -- \ + $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ + ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ + $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \ + $_VUNAME --dir "$VSERVER_DIR"/uts --missingok -- \ + $_VUNAME --set --context -- "$VSERVER_DIR" \ + $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" --flag !setup -- \ + $_VCONTEXT --migrate-self --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ + "${INITCMD_START[@]}" else ${NICE_CMD[@]} \ $_CHBIND "${CHBIND_OPTS[@]}" \