From b9f1a7fdf6528f3af7ed94af70cdd2567351ca2d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 9 Oct 2007 00:33:04 +0200
Subject: Merging casper 1.109.

---
 debian/init | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'debian/init')

diff --git a/debian/init b/debian/init
index a24fe9f..d59ed45 100644
--- a/debian/init
+++ b/debian/init
@@ -68,7 +68,12 @@ do_stop ()
         return 0
     fi
 
-    for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default; do
+    prompt=1
+    if grep -qs noprompt /proc/cmdline; then
+       prompt=
+    fi
+
+    for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty); do
         cache_path "${path}"
     done
 
@@ -84,6 +89,8 @@ do_stop ()
 	if [ -x /usr/bin/eject ]
 	then
 		eject -p -m /live/image >/dev/null 2>&1
+
+		[ "$prompt" ] || return 0
 	fi
 
 	stty sane < /dev/console
-- 
cgit v1.2.3