X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Flive-boot.init;h=f0982a8e9aad130120dc19258c5a030b19926128;hb=6b21c571a2c065b10f1048a8827ee72bf67f5f5c;hp=63b07f08c4c30d746e850c94908af021bb1401fd;hpb=c118f7bca3bb76c19a38330786568fac3a833f80;p=live-boot-grml.git

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 63b07f0..f0982a8 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -84,8 +84,7 @@ device_is_USB_flash_drive()
 	[ "$(expr substr ${DEVICE} 1 2)" != "sd" ] && return 1
 
 	# check that the device is an USB device
-	if readlink /sys/block/${DEVICE} | grep -q usb ||
-	   readlink /sys/block/${DEVICE}/device | grep -q usb # linux < 2.6.29
+	if readlink /sys/block/${DEVICE} | grep -q usb
 	then
 		return 0
 	fi
@@ -115,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
@@ -131,7 +136,7 @@ do_stop ()
 	fi
 
 	prompt=1
-	if grep -qs noprompt /proc/cmdline
+	if [ "${NOPROMPT}" = "Yes" ]
 	then
 		prompt=
 	fi
@@ -150,6 +155,8 @@ do_stop ()
 		esac
 	done
 
+	mount -o remount,ro /live/cow
+
 	if [ -z ${QUICKREBOOT} ]
 	then
 
@@ -165,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
@@ -217,8 +235,6 @@ case "${1}" in
 				[ "${VERBOSE}" != no ] && log_end_msg 1
 				;;
 		esac
-
-		mount -o remount,ro /live/cow
 		;;
 
 	*)