diff options
author | Aaron Griffin <aaron@archlinux.org> | 2006-06-06 07:22:35 +0200 |
---|---|---|
committer | Aaron Griffin <aaron@archlinux.org> | 2006-06-06 07:22:35 +0200 |
commit | b31ed489b977662292aa39978ee737b94b60af14 (patch) | |
tree | 483a6bf418d8899a703ebb4dc3d199a08c8b659c /install/autodetect | |
parent | 60d742305a5cc070f56e97bc8954a342c3180aec (diff) | |
download | mkinitcpio-b31ed489b977662292aa39978ee737b94b60af14.tar.gz mkinitcpio-b31ed489b977662292aa39978ee737b94b60af14.tar.xz |
New error conditions: fail on missing hook or missing module
Filesystem hook changes (parseblock handling)
Init changes to allow /arch.cmd command line parsing
Misc install script cleanups
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@123 880c04e9-e011-0410-abf7-b926e227c9cd
Diffstat (limited to 'install/autodetect')
-rw-r--r-- | install/autodetect | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/install/autodetect b/install/autodetect index e3543e7..ec7e624 100644 --- a/install/autodetect +++ b/install/autodetect @@ -4,15 +4,16 @@ install () { MODULE_FILE="$(mktemp /tmp/initcpio_modules.XXXXXX)" #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") + 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) " if [ -e /sbin/mdadm ]; then - if [ $UID -eq 0 -o "$(groups | grep disk)" != "" ]; then \ - AUTODETECT="$AUTODETECT $(mdadm -E -s /dev/hd* /dev/sd* /dev/rd/* /dev/ida/* \ - /dev/cciss/* /dev/ataraid/* | awk -Flevel= '{print $2}' | awk '{print $1}')" + if [ $UID -eq 0 -o "$(groups | grep disk)" != "" ]; then + AUTODETECT="$AUTODETECT + $(mdadm -E -s /dev/hd* /dev/sd* /dev/rd/* /dev/ida/* /dev/cciss/* /dev/ataraid/* \ + | awk -Flevel= '{print $2}' | awk '{print $1}')" else err "User does not have proper permissions to read superblocks, raid modules are not detected" fi |