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

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 2ea72cb..9d6bc69 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,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