Correct eject login in initscript.
authorDaniel Baumann <daniel@debian.org>
Sun, 8 Feb 2009 00:16:00 +0000 (01:16 +0100)
committerDaniel Baumann <daniel@debian.org>
Sun, 8 Feb 2009 00:16:00 +0000 (01:16 +0100)
debian/live-initramfs.init

index 8b10e90..4cf767a 100644 (file)
@@ -134,21 +134,21 @@ do_stop ()
        if [ -z ${QUICKREBOOT} ]
        then
                # TODO: i18n
-               if [ -x /usr/bin/eject ]
-               then
-                       BOOT_DEVICE="$(get_boot_device)"
+               BOOT_DEVICE="$(get_boot_device)"
 
-                       if device_is_USB_flash_drive ${BOOT_DEVICE}
+               if device_is_USB_flash_drive ${BOOT_DEVICE}
+               then
+                       # do NOT eject USB flash drives!
+                       # otherwise rebooting with most USB flash drives
+                       # failes because they actually remember the
+                       # "ejected" state even after reboot
+                       MESSAGE="Please remove the USB flash drive"
+               else
+                       # ejecting is a very good idea here
+                       MESSAGE="Please remove the disc, close the the tray (if any)"
+
+                       if [ -x /usr/bin/eject ]
                        then
-                               # do NOT eject USB flash drives!
-                               # otherwise rebooting with most USB flash drives
-                               # failes because they actually remember the
-                               # "ejected" state even after reboot
-                               MESSAGE="Please remove the USB flash drive"
-                       else
-                               # ejecting is a very good idea here
-                               MESSAGE="Please remove the disc, close the the tray (if any)"
-
                                eject -p -m /live/image >/dev/null 2>&1
                        fi