Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Leone <simo@archlinux.org>2008-04-02 20:29:01 -0500
committerSimo Leone <simo@archlinux.org>2008-04-02 20:29:01 -0500
commit397bf04baedd32fda955ab633bcf3de8fdb211e6 (patch)
treeed6bb7447de618a7601ddc167c02f1d14d85f225
parent6f4eca9a8cfc7ae7dca76a896ef101dd201bfe0d (diff)
Add USB modules to boot-cd hooks
This should allow the disk to find itself on external CD-ROM drives. Signed-off-by: Simo Leone <simo@archlinux.org>
-rw-r--r--hooks/boot-cd6
-rw-r--r--install/boot-cd8
2 files changed, 14 insertions, 0 deletions
diff --git a/hooks/boot-cd b/hooks/boot-cd
index 1773023..1670c6b 100644
--- a/hooks/boot-cd
+++ b/hooks/boot-cd
@@ -1,5 +1,11 @@
run_hook ()
{
+ # external drives may need to settle
+ msg ":: Waiting for usb devices to settle..."
+ /sbin/udevtrigger --subsystem-match=usb
+ /sbin/udevsettle
+ sleep 5
+
msg ":: Scanning for boot cdrom device..."
/bin/mkdir -p /bootmnt
diff --git a/install/boot-cd b/install/boot-cd
index 6a48716..d79bb18 100644
--- a/install/boot-cd
+++ b/install/boot-cd
@@ -1,6 +1,14 @@
install ()
{
MODULES="cdrom ide-cd ide-core ide-generic unionfs squashfs isofs $(all_modules '/kernel/fs' | grep -v "nls") "
+
+ # need usb modules for external drives
+ MODULES="${MODULES} $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl1811-hcd" -e "isp116x-hcd")"
+ MODULES=$(echo ${MODULES}) #trim whitespace
+ if [ "x${MODULES}" != "x" ]; then
+ MODULES="${MODULES} usb_storage sd_mod sr_mod"
+ fi
+
BINARIES=""
FILES=""
SCRIPT="boot-cd"