X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Finit;h=149314bef0afb35888d704ed1b48ecaa7ae04694;hb=c9afaa27f0bf39b7621e19a29f1a065cdf34f3b2;hp=b0837816d818bae911cb1950c7df9a47756fa032;hpb=cc62ca76356dc851006e3fc980cc1dcc46ef9ca6;p=live-boot-grml.git

diff --git a/debian/init b/debian/init
index b083781..149314b 100644
--- a/debian/init
+++ b/debian/init
@@ -24,6 +24,9 @@ DO_SNAPSHOT=/sbin/live-snapshot
 # Exit if system was not booted by live-initramfs
 grep -qs boot=live /proc/cmdline || exit 0
 
+# Exit if the system was booted from an ISO image rather than a physical CD
+grep -qs find_iso= /proc/cmdline && exit 0
+
 # Read configuration variable file if it is present
 [ -r /etc/live.conf ] && . /etc/live.conf
 
@@ -68,7 +71,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,10 +92,14 @@ 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
+
 	# XXX - i18n
-	echo "Please remove the disc and close the tray (if any) then press ENTER: "
+	echo "Please remove the disc and close the tray (if any) then press ENTER: " > /dev/console
 	if [ -x /sbin/usplash_write ]; then
 	    /sbin/usplash_write "TIMEOUT 86400"
 	    /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"