[SCM] live-initramfs branch, master, updated. 1.157.4-1-38-g4fe1a8d
Daniel Baumann
daniel at debian.org
Wed Jan 27 22:15:36 UTC 2010
The following commit has been merged in the master branch:
commit 4fe1a8dc2aae4243bd49e72672d2c919f70d79a9
Author: Luigi Capriotti <l.capriotti at xbmc.org>
Date: Wed Jan 27 23:12:26 2010 +0100
Adding quickusbmodules boot parameter to to avoid forced loading of usb modules.
diff --git a/scripts/live b/scripts/live
index 09e7b2f..30217d0 100755
--- a/scripts/live
+++ b/scripts/live
@@ -401,6 +401,11 @@ Arguments ()
export NOPERSISTENT
;;
+ quickusbmodules)
+ QUICKUSBMODULES="Yes"
+ export QUICKUSBMODULES
+ ;;
+
preseed/file=*|file=*)
LOCATION="${ARGUMENT#*=}"
export LOCATION
@@ -1223,37 +1228,40 @@ 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
-
- if [ -x /sbin/udevadm ]
++ if [ -z "${QUICKUSBMODULES}" ]
then
- # lenny
- udevadm trigger
- udevadm settle
- else
- # etch
- udevtrigger
- udevsettle
- fi
-
- # 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
+ # 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
- if [ $(ls -l /sys/block | wc -l) -gt ${num_block} ]
+ if [ -x /sbin/udevadm ]
then
- break
+ # lenny
+ udevadm trigger
+ udevadm settle
+ else
+ # etch
+ udevtrigger
+ udevsettle
fi
- done
+
+ # 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
+ fi
# search for label and files (this could be hugely optimized)
cowprobe=$(find_cow_device "${root_persistence}")
--
live-initramfs
More information about the debian-live-changes
mailing list