Don't do anything in initscript when using toram (Closes: #601575).

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

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 6d90059..1a85267 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
@@ -156,8 +155,6 @@ do_stop ()
                esac
        done
 
-       mount -o remount,ro /live/cow
-
        if [ -z ${QUICKREBOOT} ]
        then
 
@@ -175,7 +172,7 @@ do_stop ()
                        MESSAGE="Please remove the USB flash drive"
                else
                        # ejecting is a very good idea here
-                       MESSAGE="Please remove the disc, close the tray (if any)"
+                       MESSAGE="Please remove the disc, close the the tray (if any)"
 
                        if [ -x /usr/bin/eject ]
                        then
@@ -225,6 +222,8 @@ case "${1}" in
                                [ "${VERBOSE}" != no ] && log_end_msg 1
                                ;;
                esac
+
+               mount -o remount,ro /live/cow
                ;;
 
        *)