Releasing debian version 3.0~a7-1.

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

diff --git a/debian/live-boot.init b/debian/live-boot.init
index f8471b6..9d6bc69 100644 (file)
--- 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
@@ -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
                ;;
 
        *)