summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-11-22 22:41:50 +0100
committerDave Reisner <dreisner@archlinux.org>2012-11-26 02:08:57 +0100
commit56cda33a8cdfd3f11803cd8f7bd79be15f6ca23f (patch)
tree40ce7f323cb565958ef334afe364730f5254d0ae
parent97368c0e78f3a4fe4d62f7aedde88d4be13bfdba (diff)
downloadmkinitcpio-56cda33a8cdfd3f11803cd8f7bd79be15f6ca23f.tar.gz
mkinitcpio-56cda33a8cdfd3f11803cd8f7bd79be15f6ca23f.tar.xz
modconf: add new hook to simply inclusion of modprobe config
Add this as a default in the config file. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rw-r--r--install/modconf15
-rw-r--r--mkinitcpio.conf5
2 files changed, 16 insertions, 4 deletions
diff --git a/install/modconf b/install/modconf
new file mode 100644
index 0000000..b06b51a
--- /dev/null
+++ b/install/modconf
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+build() {
+ add_full_dir /etc/modprobe.d
+ add_full_dir /usr/lib/modprobe.d
+}
+
+help() {
+ cat <<HELPEOF
+This hook installs modprobe configuration files from /etc/modprobe.d and
+/usr/lib/modprobe.d.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/mkinitcpio.conf b/mkinitcpio.conf
index c4380af..1047011 100644
--- a/mkinitcpio.conf
+++ b/mkinitcpio.conf
@@ -16,9 +16,6 @@ BINARIES=""
# FILES
# This setting is similar to BINARIES above, however, files are added
# as-is and are not parsed in any way. This is useful for config files.
-# Some users may wish to include modprobe.conf for custom module options
-# like so:
-# FILES="/etc/modprobe.d/modprobe.conf"
FILES=""
# HOOKS
@@ -52,7 +49,7 @@ FILES=""
#
## NOTE: If you have /usr on a separate partition, you MUST include the
# usr, fsck and shutdown hooks.
-HOOKS="base udev autodetect block filesystems usbinput fsck"
+HOOKS="base udev autodetect modconf block filesystems usbinput fsck"
# COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression