X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=f0982a8e9aad130120dc19258c5a030b19926128;hb=8f1c52f198d4f59482d74cf6efc4029173ae1c34;hp=9d6bc69ae9ec3451b8fca5cbf0555d1ff0aa5054;hpb=2a7c08fbc58e599b8bcd884deda606d221637046;p=live-boot-grml.git

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 9d6bc69..f0982a8 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -114,6 +114,12 @@ do_stop ()
 		return 0
 	fi
 
+	# check for toram
+	if grep -qs toram /proc/cmdline
+	then
+		return 0
+	fi
+
 	# Don't prompt to eject the SD card on Babbage board, where we reuse it
 	# as a quasi-boot-floppy. Technically this uses a bit of ubiquity
 	# (archdetect), but since this is mostly only relevant for
@@ -130,7 +136,7 @@ do_stop ()
 	fi
 
 	prompt=1
-	if grep -qs noprompt /proc/cmdline
+	if [ "${NOPROMPT}" = "Yes" ]
 	then
 		prompt=
 	fi
@@ -149,6 +155,8 @@ do_stop ()
 		esac
 	done
 
+	mount -o remount,ro /live/cow
+
 	if [ -z ${QUICKREBOOT} ]
 	then
 
@@ -164,15 +172,26 @@ 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)"
+			MESSAGE="Please remove the disc, close the tray (if any)"
 
 			if [ -x /usr/bin/eject ]
 			then
 				eject -p -m /live/image >/dev/null 2>&1
 			fi
 
+			if [ ${NOPROMPT} = "cd" ]
+			then
+				prompt=
+			fi
+
 		fi
 
 		[ "$prompt" ] || return 0
@@ -216,8 +235,6 @@ case "${1}" in
 				[ "${VERBOSE}" != no ] && log_end_msg 1
 				;;
 		esac
-
-		mount -o remount,ro /live/cow
 		;;
 
 	*)