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

diff --git a/debian/init b/debian/init
index a24fe9f..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,6 +92,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