diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-05-03 04:02:53 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-05-03 04:02:53 +0200 |
| commit | ad1050964eabbbc00547e8c6c91d8a7c3f13598f (patch) | |
| tree | 79962456d502bbbb8a072568f31bd18e99b85099 /hooks | |
| parent | 66f28ea341f293cbddd30242f9ea03673d4674d2 (diff) | |
| download | mkinitcpio-ad1050964eabbbc00547e8c6c91d8a7c3f13598f.tar.gz mkinitcpio-ad1050964eabbbc00547e8c6c91d8a7c3f13598f.tar.xz | |
Merged autodetect changes from tpowa.
Removed older subsystem specific scripts, replaced then
with 'modload' just to keep the option in place.
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@43 880c04e9-e011-0410-abf7-b926e227c9cd
Diffstat (limited to 'hooks')
| -rw-r--r-- | hooks/ide | 11 | ||||
| -rw-r--r-- | hooks/modload (renamed from hooks/sata) | 18 | ||||
| -rw-r--r-- | hooks/pci | 9 | ||||
| -rw-r--r-- | hooks/scsi | 34 | ||||
| -rw-r--r-- | hooks/usb | 1 |
5 files changed, 17 insertions, 56 deletions
diff --git a/hooks/ide b/hooks/ide deleted file mode 100644 index a6ca17c..0000000 --- a/hooks/ide +++ /dev/null @@ -1,11 +0,0 @@ -# vim: set ft=sh: -run_hook () -{ - if [ -e /proc/ide ]; then - msg -n "Loading ide modules..." - /bin/modprobe -q -a $(/bin/cat /sys/bus/ide/devices/*/modalias) >/dev/null 2>&1 - msg "done" - else - msg "No ide devices detected..." - fi -} diff --git a/hooks/sata b/hooks/modload index fb6ed90..6cf4037 100644 --- a/hooks/sata +++ b/hooks/modload @@ -1,7 +1,20 @@ -# vim: set ft=sh: +# vim:set ft=sh: run_hook () { - if [ -e /sys/bus/scsi/devices/ ]; then + msg ":: Begin manual module load" + if [ -e "/sys/bus/pci/" ]; then + msg -n "Loading pci bus modules..." + /bin/modprobe -a -q $(/bin/cat /sys/bus/pci/devices/*/modalias) >/dev/null 2>&1 + msg "done." + fi + + if [ -e "/sys/bus/ide/devices/" ]; then + msg -n "Loading ide modules..." + /bin/modprobe -q -a $(/bin/cat /sys/bus/ide/devices/*/modalias) >/dev/null 2>&1 + msg "done" + fi + + if [ -e "/sys/bus/scsi/devices/" ]; then msg -n "Loading scsi modules..." for d in /sys/bus/scsi/devices/*; do if [ -e "${d}/type" ]; then @@ -31,4 +44,5 @@ run_hook () done msg "done." fi + msg ":: End manual module load" } diff --git a/hooks/pci b/hooks/pci deleted file mode 100644 index d158d25..0000000 --- a/hooks/pci +++ /dev/null @@ -1,9 +0,0 @@ -# vim:set ft=sh: -run_hook () -{ - if [ -e "/sys/bus/pci" ]; then - msg -n "Loading pci bus modules..." - /bin/modprobe -a -q $(/bin/cat /sys/bus/pci/devices/*/modalias) >/dev/null 2>&1 - msg "done." - fi -} diff --git a/hooks/scsi b/hooks/scsi deleted file mode 100644 index fb6ed90..0000000 --- a/hooks/scsi +++ /dev/null @@ -1,34 +0,0 @@ -# vim: set ft=sh: -run_hook () -{ - if [ -e /sys/bus/scsi/devices/ ]; then - msg -n "Loading scsi modules..." - for d in /sys/bus/scsi/devices/*; do - if [ -e "${d}/type" ]; then - read m < "${d}/type" - case "$m" in - 0) /bin/modprobe -q sd_mod 2>&1 >/dev/null ;; - # this below is take from the Arch udev rules - 1) read vendor < "${d}/vendor" - if [ "${vendor}" = "Onstream" ]; then - read model < "${d}/model" - case "$model" in - ADR*) /bin/modprobe -q st >/dev/null 2>&1;; - *) /bin/modprobe -q osst >/dev/null 2>&1;; - esac - else - /bin/modprobe -q st >/dev/null 2>&1 - fi - ;; - 2|3) /bin/modprobe -q sg >/dev/null 2>&1;; - 4|5) /bin/modprobe -q sr_mod >/dev/null 2>&1;; - 6) /bin/modprobe -q sg >/dev/null 2>&1;; - 7) /bin/modprobe -q sd_mod >/dev/null 2>&1;; - 8|9) /bin/modprobe -q sg >/dev/null 2>&1;; - 14) /bin/modprobe -q sd_mod >/dev/null 2>&1;; - esac - fi - done - msg "done." - fi -} @@ -4,6 +4,7 @@ run_hook () msg -n "Loading usb modules..." /bin/modprobe -aq $(/bin/cat /sys/bus/usb/devices/*/modalias) >/dev/null 2>&1 #allow 'usbdelay' on the kernel param line + msg -n "waiting for usb to settle..." /bin/sleep ${usbdelay:-5} msg "done." } |