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/pcmcia | |
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/pcmcia')
-rw-r--r-- | install/pcmcia | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/install/pcmcia b/install/pcmcia index 4e419c0..b5ca7fb 100644 --- a/install/pcmcia +++ b/install/pcmcia @@ -2,17 +2,14 @@ install () { - MODULES=" $(checked_modules "/pcmcia/" | grep -ve "sound" -e "net") $(checked_modules "/ide/legacy")" + MODULES=" $(checked_modules '/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" MODULES=$(echo ${MODULES}) #trim whitespace if [ "x${MODULES}" != "x" ]; then - MODULES="${MODULES} sd_mod\nsr_mod\nide-disk\nide-cd" + MODULES="${MODULES} sd_mod sr_mod ide-disk ide-cd" fi - BINARIES="" - FILES="" + BINARIES="/sbin/pcmcia-socket-startup.static /sbin/pcmcia-check-broken-cis.static" + FILES="/etc/pcmcia/config.opts" SCRIPT="" - add_file "/sbin/pcmcia-socket-startup.static" "/sbin/pcmcia-socket-startup" - add_file "/sbin/pcmcia-check-broken-cis.static" "/sbin/pcmcia-check-broken-cis" - add_file "/etc/pcmcia/config.opts" } help () |