Updating year in copyright file.

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

diff --git a/debian/live-initramfs.init b/debian/live-initramfs.init
index 2082a2b..5c79401 100644 (file)
--- a/debian/live-initramfs.init
+++ b/debian/live-initramfs.init
@@ -85,7 +85,8 @@ 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}/device | grep -q usb
+       if readlink /sys/block/${DEVICE} | grep -q usb ||
+          readlink /sys/block/${DEVICE}/device | grep -q usb # linux < 2.6.29
        then
                return 0
        fi
@@ -106,8 +107,6 @@ do_stop ()
                then
                        ${DO_SNAPSHOT} --resync-string="${HOMESNAP}"
                fi
-       else
-               return 0
        fi
 
        # check for netboot
@@ -138,6 +137,11 @@ do_stop ()
 
        if [ -z ${QUICKREBOOT} ]
        then
+               # in order to deal with the aufs unmount problem, we do a sync here.
+               sync
+               sleep 1
+               sync
+
                # TODO: i18n
                BOOT_DEVICE="$(get_boot_device)"
 
@@ -157,12 +161,13 @@ do_stop ()
                                eject -p -m /live/image >/dev/null 2>&1
                        fi
 
-                       [ "$prompt" ] || return 0
                fi
 
+               [ "$prompt" ] || return 0
+
                stty sane < /dev/console
 
-               echo -n -e "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
+               printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
 
                if [ -x /sbin/usplash_write ]
                then