diff options
| author | Dave Reisner <d@falconindy.com> | 2011-06-08 22:29:40 +0200 |
|---|---|---|
| committer | Thomas Bächler <thomas@archlinux.org> | 2011-06-25 12:25:45 +0200 |
| commit | 99c2b87cdbc3f449b68ed6d0bf2fec624d539972 (patch) | |
| tree | 8acc5152c4ce01a22d13a6c9e6b3544c63ed5d25 /install/scsi | |
| parent | 733afaaa9c52e55d047d5e6a5d689131e1fde3e6 (diff) | |
| download | mkinitcpio-99c2b87cdbc3f449b68ed6d0bf2fec624d539972.tar.gz mkinitcpio-99c2b87cdbc3f449b68ed6d0bf2fec624d539972.tar.xz | |
install/{sata,pata,scsi}: cleanup and simplify
* Use loops where possible for module addition
* remove superfluous trim operation
* remove antiquated filters for modules which do not exist
Signed-off-by: Dave Reisner <d@falconindy.com>
Diffstat (limited to 'install/scsi')
| -rw-r--r-- | install/scsi | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/install/scsi b/install/scsi index 9a97a8c..2641255 100644 --- a/install/scsi +++ b/install/scsi @@ -1,25 +1,20 @@ -# vim: set ft=sh: +#!/bin/bash -build() -{ - MODULES=" $(checked_modules "/scsi/" | grep -ve "imm" -e "pdc_adma" -e "ahci" -e "ata" -e "pcmcia" -e "ide") - $(checked_modules "/block/" | grep -e "cciss" -e "cpqarray" -e "DAC960") - $(checked_modules "/fusion/")" +build(){ - MODULES=$(echo ${MODULES}) #trim whitespace - if [ -n "${MODULES}" ]; then - MODULES="${MODULES} sd_mod" - fi - BINARIES="" - FILES="" - SCRIPT="" + MODULES="$(checked_modules "/scsi/" | grep -vE '(imm|ata|pcmcia)') + $(checked_modules "/block/" | grep -E '(cciss|cpqarray|DAC960)') + $(checked_modules "/fusion/")" + + [[ $MODULES ]] && MODULES+=" sd_mod" } -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for an scsi root device. - Detection will take place at runtime. To minimize the modules - in the image, add the autodetect hook too. +help() { + cat<<HELPEOF +This hook loads the necessary modules for an scsi root device. Detection will +take place at runtime. To minimize the modules in the image, add the autodetect +hook too. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: |