Releasing debian version 3.0~a5-1.

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

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 12d0f94..03bc390 100644 (file)
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -83,8 +83,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
@@ -134,7 +133,7 @@ do_stop ()
                prompt=
        fi
 
-       for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth /sbin/usplash_write
+       for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth
        do
                cache_path "${path}"
        done
@@ -185,13 +184,6 @@ do_stop ()
 
                        printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
 
-                       if [ -x /sbin/usplash_write ]
-                       then
-                               /sbin/usplash_write "TIMEOUT 86400"
-                               /sbin/usplash_write "TEXT-URGENT ${MESSAGE}"
-                               /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
-                       fi
-
                        read x < /dev/console
                fi
        fi