summaryrefslogtreecommitdiffstats
path: root/install/autodetect
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-08-08 08:00:51 +0200
committerAaron Griffin <aaron@archlinux.org>2006-08-08 08:00:51 +0200
commitfa3196ada9c51ac252afe5e5162c5f19c9906529 (patch)
tree4c1e497cbcbfc8a10b97648467f19cf5d85eb354 /install/autodetect
parent87435ead23ec7e8538d8051d30dc552f92ffb8ae (diff)
downloadmkinitcpio-fa3196ada9c51ac252afe5e5162c5f19c9906529.tar.gz
mkinitcpio-fa3196ada9c51ac252afe5e5162c5f19c9906529.tar.xz
Init fixes for the silly "." issue.
Added new and improved filesystem detection... git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@151 880c04e9-e011-0410-abf7-b926e227c9cd
Diffstat (limited to 'install/autodetect')
-rw-r--r--install/autodetect13
1 files changed, 11 insertions, 2 deletions
diff --git a/install/autodetect b/install/autodetect
index 8bcae91..a338d3b 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -6,8 +6,17 @@ install ()
#blegh, we'll let /tmp clean itself up
AUTODETECT="$(auto_modules -e '/scsi/' -e '/block' -e '/fusion/' \
-e '/usb/' -e '/ide/' -e '/ieee1394/' -e '/cdrom' \
- -e '/net/' -e '/pcmcia')
- $(cat /proc/filesystems | grep -v nodev) "
+ -e '/net/' -e '/pcmcia')"
+
+ #Filesystem detection, use sysfs instead of /proc
+ for blk in $(ls /sys/block/*/*/dev | cut -d/ -f5); do
+ eval $(/usr/lib/klibc/bin/fstype < /dev/${blk})
+ for mod in $(find "${MODULEDIR}" -type f -name "${FSTYPE}.ko"); do
+ if [ "x${mod}" != "x" ]; then
+ AUTODETECT="${AUTODETECT} ${mod}"
+ fi
+ done
+ done
if [ -e /sbin/mdadm ]; then
if [ $UID -eq 0 -o "$(groups | grep disk)" != "" ]; then