summaryrefslogtreecommitdiffstats
path: root/install/pcmcia
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2011-07-11 04:20:28 +0200
committerDave Reisner <dreisner@archlinux.org>2011-09-27 12:18:04 +0200
commit5a0f7ebc8d2cede7532539268e0ffc0bd6816572 (patch)
tree1709a7c58504db390f0161977af581e32da394fc /install/pcmcia
parentff557b25937b3511dd04e009a4735b73d1279d4c (diff)
downloadmkinitcpio-5a0f7ebc8d2cede7532539268e0ffc0bd6816572.tar.gz
mkinitcpio-5a0f7ebc8d2cede7532539268e0ffc0bd6816572.tar.xz
functions: allow ignoring errors on module addition
We conditionally, but naively, add modules in some of our install hooks, but the kernel may not have these. Note that these modules can fail silently by detecting a '?' suffix on the module name. In conjunction with this, the add_module function now takes a flag, -t or --try, which will ignore module not found errors from modinfo. The config file will also support this syntax. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'install/pcmcia')
-rw-r--r--install/pcmcia5
1 files changed, 2 insertions, 3 deletions
diff --git a/install/pcmcia b/install/pcmcia
index b390497..2e9ac9a 100644
--- a/install/pcmcia
+++ b/install/pcmcia
@@ -4,9 +4,8 @@ build() {
FILES="/etc/pcmcia/config.opts"
MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')"
- if [[ $MODULES ]]; then
- MODULES+=" sd_mod"
- fi
+ [[ $MODULES ]] MODULES+=" sd_mod?"
+
add_binary "/lib/udev/pcmcia-socket-startup"
add_binary "/lib/udev/pcmcia-check-broken-cis"
add_file "/lib/udev/rules.d/60-pcmcia.rules"