summaryrefslogtreecommitdiffstats
path: root/hooks
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-04-27 19:08:47 +0200
committerAaron Griffin <aaron@archlinux.org>2006-04-27 19:08:47 +0200
commit2ed876b6b5c7b431caf5c452d6ee4a67241c4d01 (patch)
treed8e3c850df5bc1a7f262b810fbf273761eb15266 /hooks
parentb3002a0c9ec4f3a299b5756695fb28957a83e005 (diff)
downloadmkinitcpio-2ed876b6b5c7b431caf5c452d6ee4a67241c4d01.tar.gz
mkinitcpio-2ed876b6b5c7b431caf5c452d6ee4a67241c4d01.tar.xz
Added 'autodetect' hook, intended to replace *-auto scripts
Beginnings of raid and dm hooks Used sysfs for ide parsing git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@25 880c04e9-e011-0410-abf7-b926e227c9cd
Diffstat (limited to 'hooks')
-rw-r--r--hooks/autodetect9
-rw-r--r--hooks/ide14
-rw-r--r--hooks/raid12
3 files changed, 11 insertions, 24 deletions
diff --git a/hooks/autodetect b/hooks/autodetect
new file mode 100644
index 0000000..bffdff3
--- /dev/null
+++ b/hooks/autodetect
@@ -0,0 +1,9 @@
+# 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/hooks/ide b/hooks/ide
index 0a81062..a6ca17c 100644
--- a/hooks/ide
+++ b/hooks/ide
@@ -3,19 +3,7 @@ run_hook ()
{
if [ -e /proc/ide ]; then
msg -n "Loading ide modules..."
- /bin/modprobe -q ide-generic >/dev/null 2>&1
- for d in /proc/ide/*; do
- unit=${d#/proc/ide/}
- if [ -e "${d}/media" -a ! -d "/sys/block/${unit}" ]; then
- read m < "${d}/media"
- case "${m}" in
- disk) /bin/modprobe -q ide-disk >/dev/null 2>&1;;
- cdrom) /bin/modprobe -q ide-cd >/dev/null 2>&1;;
- tape) /bin/modprobe -q ide-tape >/dev/null 2>&1;;
- floppy) /bin/modprobe -q ide-floppy >/dev/null 2>&1;;
- esac
- fi
- done
+ /bin/modprobe -q -a $(/bin/cat /sys/bus/ide/devices/*/modalias) >/dev/null 2>&1
msg "done"
else
msg "No ide devices detected..."
diff --git a/hooks/raid b/hooks/raid
index a81c172..d83e2ae 100644
--- a/hooks/raid
+++ b/hooks/raid
@@ -1,15 +1,5 @@
# vim: set ft=sh:
-
-# kinit handles md/raid assembly
-# we just need modules
-
-install ()
-{
- MODULES=" $(find "${MODULEDIR}/kernel/drivers/md/" -name *.ko) md raid0 raid1 raid2 raid5 raid6"
- BINARIES=""
- FILES=""
-}
-
+# kinit handles md/raid assembly we just need modules
run_hook ()
{
#TODO