X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.start;h=c5db43b5dc41a3ab22d501f44cd84092a8b21195;hb=462c8268093c2b86d36139a50296c125e48cc81f;hp=0e1333155bf3fdfcbcfeea3869d78e9115fd414b;hpb=7a6aff490e0219374b59047c1e29322d3deff914;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index 0e13331..c5db43b 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= @@ -51,10 +52,11 @@ if $_VSERVER_INFO - FEATURE migrate; then $_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" \ + $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ + $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ $_VATTRIBUTE --set "${OPTS_VATTRIBUTE[@]}" -- \ - $_VCONTEXT --migrate-self --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ + $_SAVE_CTXINFO "$VSERVER_DIR" \ + $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT "${OPTS_VCONTEXT_MIGRATE[@]}" -- \ "${INITCMD_START[@]}" else ${NICE_CMD[@]} \ @@ -64,7 +66,7 @@ else $_SAVE_CTXINFO "$VSERVER_DIR" \ $_CLEARENV \ $_CAPCHROOT "${CAPCHROOT_OPTS[@]}" . \ - ${INITCMD_START[@]} + "${INITCMD_START[@]}" fi "${INITCMD_START_SYNC[@]}"