diff options
| author | Tobias Powalowski <tpowa@archlinux.org> | 2006-05-07 15:03:33 +0200 |
|---|---|---|
| committer | Tobias Powalowski <tpowa@archlinux.org> | 2006-05-07 15:03:33 +0200 |
| commit | c65948fcdfca6da75f42615959660c2293c907c4 (patch) | |
| tree | c6e94bf836d5f97b57d6bbe9d17a0b5ce74ede7c | |
| parent | 3c2796fc34d6b5d41c9ff7b4389651bbbe6d018b (diff) | |
| download | mkinitcpio-c65948fcdfca6da75f42615959660c2293c907c4.tar.gz mkinitcpio-c65948fcdfca6da75f42615959660c2293c907c4.tar.xz | |
'fixed mdadm check and modprobe hardcoded'
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@79 880c04e9-e011-0410-abf7-b926e227c9cd
| -rw-r--r-- | hooks/autodetect | 9 | ||||
| -rw-r--r-- | init | 3 | ||||
| -rw-r--r-- | install/autodetect | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/hooks/autodetect b/hooks/autodetect deleted file mode 100644 index bffdff3..0000000 --- a/hooks/autodetect +++ /dev/null @@ -1,9 +0,0 @@ -# vim: set ft=sh: -run_hook () -{ - if [ -e /modules ]; then - while read mod; do - /bin/modprobe -q $mod >/dev/null 2>&1 - done < /modules - fi -} @@ -13,7 +13,6 @@ export CMDLINE # Used so hooks can override params to kinit export kinit_params="" -read OLDMODPROBE </proc/sys/kernel/modprobe echo "/bin/modprobe" > /proc/sys/kernel/modprobe for cmd in $CMDLINE; do @@ -79,5 +78,5 @@ fi # Optimize fs type loop for mounting rootfs msg ":: Initramfs Completed - control passing to kinit" -echo "${OLDMODPROBE}" > /proc/sys/kernel/modprobe +echo "/sbin/modprobe" > /proc/sys/kernel/modprobe exec /bin/kinit "root=${root}" ${kinit_params} < /dev/console > /dev/console diff --git a/install/autodetect b/install/autodetect index 73d8a21..88c26eb 100644 --- a/install/autodetect +++ b/install/autodetect @@ -8,7 +8,7 @@ install () -e "/usb/" -e "/ide/" -e "/ieee1394/" -e "/cdrom"\ -e "/net/" -e "/pcmcia") $(cat /proc/filesystems | grep -v nodev) \ - $(mdadm -E -s /dev/hd* /dev/sd* | awk -Flevel= '{print $2}' | awk '{print $1}') " + $([ -e /sbin/mdadm ] && mdadm -E -s /dev/hd* /dev/sd* | awk -Flevel= '{print $2}' | awk '{print $1}') " for m in $AUTODETECT; do modname="$(basename ${m%%\.ko})" |