summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-06-25 18:34:07 +0200
committerThomas Bächler <thomas@archlinux.org>2011-06-25 18:52:24 +0200
commit18eb47e46e0630638011e05cd549ec5d8e0bf490 (patch)
treee2a43724c79587c43f53fa6047bca09a2316d877
parentead707165e3b084b814ae924e6d206720f414031 (diff)
downloadmkinitcpio-18eb47e46e0630638011e05cd549ec5d8e0bf490.tar.gz
mkinitcpio-18eb47e46e0630638011e05cd549ec5d8e0bf490.tar.xz
Fix some install hooks due recent change in all_modules()
[fw] Avoid inclusion of kernel/sound/firewire [pcmcia] Avoid inclusion of kernel/sound/pcmcia [usb] and [usbinput] Avoid inclusion of ignored modules (via grep cmd) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--install/fw2
-rw-r--r--install/pcmcia2
-rw-r--r--install/usb2
-rw-r--r--install/usbinput2
4 files changed, 4 insertions, 4 deletions
diff --git a/install/fw b/install/fw
index a5a77cb..7d7f06f 100644
--- a/install/fw
+++ b/install/fw
@@ -2,7 +2,7 @@
build()
{
- MODULES=" $(checked_modules "/firewire/") "
+ MODULES=" $(checked_modules "/drivers/firewire/") "
MODULES=$(echo ${MODULES}) #trim whitespace
if [ -n "${MODULES}" ]; then
diff --git a/install/pcmcia b/install/pcmcia
index a9920c1..7930d83 100644
--- a/install/pcmcia
+++ b/install/pcmcia
@@ -2,7 +2,7 @@
build()
{
- MODULES=" $(checked_modules '/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')"
+ MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')"
MODULES=$(echo ${MODULES}) #trim whitespace
if [ -n "${MODULES}" ]; then
MODULES="${MODULES} sd_mod"
diff --git a/install/usb b/install/usb
index 620f695..db2d08e 100644
--- a/install/usb
+++ b/install/usb
@@ -2,7 +2,7 @@
build()
{
- MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd")"
+ MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd")"
MODULES=$(echo ${MODULES}) #trim whitespace
if [ -n "${MODULES}" ]; then
diff --git a/install/usbinput b/install/usbinput
index a90cd15..e4bf27e 100644
--- a/install/usbinput
+++ b/install/usbinput
@@ -2,7 +2,7 @@
build()
{
- MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd") "
+ MODULES=" $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811_hcd" -e "isp116x_hcd") "
MODULES=" $(echo ${MODULES}) $(all_modules "/hid/hid-") "
MODULES=$(echo ${MODULES}) #trim whitespace