Adding upstream version 2.0.4.

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index e660ac4..60a2c33 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -462,7 +462,7 @@ is_nice_device ()
 {
        sysfs_path="${1#/sys}"
 
-       if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+       if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
        then
                return 0
        elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -1626,16 +1626,6 @@ find_livefs ()
        return 1
 }
 
-set_usplash_timeout ()
-{
-       if [ -x /sbin/usplash_write ]
-       then
-               /sbin/usplash_write "TIMEOUT 120"
-       else if [ -x /sbin/splashy_update ] ; then
-               /sbin/splashy_update "TIMEOUT 120"
-       fi ; fi
-}
-
 integrity_check ()
 {
        media_mountpoint="${1}"
@@ -1662,14 +1652,6 @@ integrity_check ()
        fi
 }
 
-start_usplash_pulse ()
-{
-       if [ -x /sbin/usplash_write ]
-       then
-               /sbin/usplash_write "PULSELOGO"
-       fi
-}
-
 mountroot ()
 {
         if [ -x /scripts/local-top/cryptroot ]; then
@@ -1688,9 +1670,6 @@ mountroot ()
 
        Arguments
 
-       set_usplash_timeout
-       start_usplash_pulse
-
        maybe_break live-premount
        log_begin_msg "Running /scripts/live-premount"
        run_scripts /scripts/live-premount
@@ -1699,8 +1678,6 @@ mountroot ()
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout
 
-       set_usplash_timeout
-
        if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
        then
                if do_netmount