X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=debian%2Flive-boot.init;h=c947e125324a30556b9b5e629a570810569bd8ca;hb=3c6ccf74fb3500571f2f35db5571135bebfd548f;hp=f8471b68635bb2ab5386335dd9d5d75ce0163061;hpb=a8c577a5c5a2e6a910986aa880347c73d3103077;p=live-boot-grml.git

diff --git a/debian/live-boot.init b/debian/live-boot.init
index f8471b6..c947e12 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -49,7 +49,7 @@ cache_path()
 	then
 		if [ -x "${path}" ]
 		then
-			if file -L "${path}" | grep -q 'dynamically linked'
+			if file "${path}" | grep -q 'dynamically linked'
 			then
 				for lib in $(ldd "${path}" | awk '{ print $3 }')
 				do
@@ -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,12 +114,6 @@ 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
@@ -156,8 +149,6 @@ do_stop ()
 		esac
 	done
 
-	mount -o remount,ro /live/cow
-
 	if [ -z ${QUICKREBOOT} ]
 	then
 
@@ -225,6 +216,8 @@ case "${1}" in
 				[ "${VERBOSE}" != no ] && log_end_msg 1
 				;;
 		esac
+
+		mount -o remount,ro /live/cow
 		;;
 
 	*)