diff options
| author | Thomas Bächler <thomas@archlinux.org> | 2007-05-12 19:10:00 +0200 |
|---|---|---|
| committer | Thomas Bächler <thomas@archlinux.org> | 2007-05-12 19:10:00 +0200 |
| commit | 6e3bc94f2d9a8f5823aeac9bce5418caf2a1d2b8 (patch) | |
| tree | 94ecae80ccb3de7ec1307f21ea622656289eca1f /hooks | |
| parent | 42d5e5df66eac7d9d8db1a091535878f6307675d (diff) | |
| download | mkinitcpio-6e3bc94f2d9a8f5823aeac9bce5418caf2a1d2b8.tar.gz mkinitcpio-6e3bc94f2d9a8f5823aeac9bce5418caf2a1d2b8.tar.xz | |
- adjusted all hooks for new modprobe path
- added compatibility symlink /bin/modprobe
- 0.5.14 release
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@206 880c04e9-e011-0410-abf7-b926e227c9cd
Diffstat (limited to 'hooks')
| -rw-r--r-- | hooks/filesystems | 2 | ||||
| -rw-r--r-- | hooks/modload | 24 | ||||
| -rw-r--r-- | hooks/raid | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/hooks/filesystems b/hooks/filesystems index a7c9916..ba29443 100644 --- a/hooks/filesystems +++ b/hooks/filesystems @@ -41,6 +41,6 @@ run_hook () echo "ERROR: root fs cannot be detected. Try using the rootfstype= kernel parameter." else kinit_params="${kinit_params} rootfstype=${FSTYPE}" - /bin/modprobe -q "${FSTYPE}" >/dev/null 2>&1 + /sbin/modprobe -q "${FSTYPE}" >/dev/null 2>&1 fi } diff --git a/hooks/modload b/hooks/modload index 6cf4037..41361c1 100644 --- a/hooks/modload +++ b/hooks/modload @@ -4,13 +4,13 @@ run_hook () 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 + /sbin/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 + /sbin/modprobe -q -a $(/bin/cat /sys/bus/ide/devices/*/modalias) >/dev/null 2>&1 msg "done" fi @@ -20,25 +20,25 @@ run_hook () if [ -e "${d}/type" ]; then read m < "${d}/type" case "$m" in - 0) /bin/modprobe -q sd_mod 2>&1 >/dev/null ;; + 0) /sbin/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;; + ADR*) /sbin/modprobe -q st >/dev/null 2>&1;; + *) /sbin/modprobe -q osst >/dev/null 2>&1;; esac else - /bin/modprobe -q st >/dev/null 2>&1 + /sbin/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;; + 2|3) /sbin/modprobe -q sg >/dev/null 2>&1;; + 4|5) /sbin/modprobe -q sr_mod >/dev/null 2>&1;; + 6) /sbin/modprobe -q sg >/dev/null 2>&1;; + 7) /sbin/modprobe -q sd_mod >/dev/null 2>&1;; + 8|9) /sbin/modprobe -q sg >/dev/null 2>&1;; + 14) /sbin/modprobe -q sd_mod >/dev/null 2>&1;; esac fi done @@ -2,7 +2,7 @@ run_hook () { #TODO scan for these somehow... - /bin/modprobe -aq linear multipath raid0 raid1 raid456 raid10>/dev/null 2>&1 + /sbin/modprobe -aq linear multipath raid0 raid1 raid456 raid10>/dev/null 2>&1 # md= can be specified multiple times. The simplistic commandline # parsing does not handle this, so we will let mdassemble parse it /bin/mdassemble ${CMDLINE} |