summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hooks/autodetect9
-rw-r--r--init3
-rw-r--r--install/autodetect2
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
-}
diff --git a/init b/init
index 7cf4943..774c106 100644
--- a/init
+++ b/init
@@ -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})"