Adding noprompt={usb,cd} feature.

[live-boot-grml.git] / debian / live-boot.init

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 1a85267..dd338b1 100644 (file)
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -136,7 +136,7 @@ do_stop ()
        fi
 
        prompt=1
-       if grep -qs noprompt /proc/cmdline
+       if [ ${NOPROMPT} = "Yes" ]
        then
                prompt=
        fi
@@ -170,6 +170,12 @@ do_stop ()
                        # failes because they actually remember the
                        # "ejected" state even after reboot
                        MESSAGE="Please remove the USB flash drive"
+
+                       if [ ${NOPROMPT} = "usb" ]
+                       then
+                               prompt=
+                       fi
+
                else
                        # ejecting is a very good idea here
                        MESSAGE="Please remove the disc, close the the tray (if any)"
@@ -179,6 +185,11 @@ do_stop ()
                                eject -p -m /live/image >/dev/null 2>&1
                        fi
 
+                       if [ ${NOPROMPT} = "cd" ]
+                       then
+                               prompt=
+                       fi
+
                fi
 
                [ "$prompt" ] || return 0