Merging casper 1.128.

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

diff --git a/scripts/live b/scripts/live
index 7632fc8..8cff606 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -994,6 +994,30 @@ setup_unionfs ()
        # Looking for "${root_persistence}" device or file
        if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
        then
+               # Load USB modules
+               num_block=$(ls -l /sys/block | wc -l)
+               for module in sd_mod uhci-hcd ehci-hcd ohci-hcd usb-storage
+               do
+                       modprobe -q -b ${module}
+               done
+
+               udevtrigger
+               udevsettle
+
+               # For some reason, udevsettle does not block in this scenario,
+               # so we sleep for a little while.
+               #
+               # See https://bugs.launchpad.net/ubuntu/+source/casper/+bug/84591
+               for timeout in 5 4 3 2 1
+               do
+                       sleep 1
+
+                       if [ $(ls -l /sys/block | wc -l) -gt ${num_block} ]
+                       then
+                               break
+                       fi
+               done
+
                cowprobe=$(find_cow_device "${root_persistence}")
 
                if [ -b "${cowprobe}" ]
@@ -1034,10 +1058,10 @@ setup_unionfs ()
                [ "${quiet}" != "y" ] && log_begin_msg \
                        "Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
                nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
-                       panic "Can not mount ${cowdevice} on /cow"
+                       panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
        else
-               mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || \
-                       panic "Can not mount ${cowdevice} on /cow"
+               mount -t ${cow_fstype} -o rw,noatime ${cowdevice} /cow || \
+                       panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
        fi
 
        rofscount=$(echo ${rofslist} |wc -w)