Applying patch from Michael Casadevall <mcasadevall@ubuntu.com> to add platform-sata_...

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

diff --git a/scripts/live b/scripts/live
index a17eb42..8be3942 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]$'
@@ -1813,6 +1813,12 @@ mountroot ()
                mount --move /live/image /root/live/image
        fi
 
+       # aufs2 in kernel versions around 2.6.33 has a regression:
+       # directories can't be accessed when read for the first the time,
+       # causing a failure for example when accessing /var/lib/fai
+       # when booting FAI, this simple workaround solves it
+       ls /root/* >/dev/null 2>&1
+
        maybe_break live-bottom
        log_begin_msg "Running /scripts/live-bottom\n"