diff options
| author | Bernhard Walle <bernhard@bwalle.de> | 2012-01-17 22:08:24 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-01-19 21:13:00 +0100 |
| commit | cd6c8ee3808089f39c4a041b339d9188e0eaa59f (patch) | |
| tree | ad406d718dc39ce2528e07b3af026da1d9413dde | |
| parent | ffa25133d812f6cdf246f13dd730941502ceabba (diff) | |
| download | ptxdist-cd6c8ee3808089f39c4a041b339d9188e0eaa59f.tar.gz ptxdist-cd6c8ee3808089f39c4a041b339d9188e0eaa59f.tar.xz | |
rootfs: Allow installation of /etc/modprobe.conf
I added this option in rootfs and not in module-init-tools because there
are various implementations of modprobe that are using that file
(module-init-tools, busybox and possibly kmod in future).
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
[mol: keep it more or less alphabetical]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/rootfs.in | 10 | ||||
| -rw-r--r-- | rules/rootfs.make | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/rules/rootfs.in b/rules/rootfs.in index ecc3bf8e6..ae65187db 100644 --- a/rules/rootfs.in +++ b/rules/rootfs.in @@ -357,6 +357,16 @@ config ROOTFS_ISSUE If enabled, it installs the "./projectroot/etc/issue" file if present, else a generic one will be generated using 'figlet'. +config ROOTFS_MODPROBE_CONF + bool + default n + prompt "install /etc/modprobe.conf" + help + If enabled, it installs the "./projectroot/etc/modprobe.conf" file if + present. Default options for kernel modules can be configured in that + file. It's read either in busybox modprobe or in the module-init-tools + modprobe implementation. + config ROOTFS_NSSWITCH_CONF bool default y diff --git a/rules/rootfs.make b/rules/rootfs.make index ca7d3f4e2..13a5f2c1c 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -202,6 +202,9 @@ endif ifdef PTXCONF_ROOTFS_HOSTS @$(call install_alternative, rootfs, 0, 0, 0644, /etc/hosts) endif +ifdef PTXCONF_ROOTFS_MODPROBE_CONF + @$(call install_alternative, rootfs, 0, 0, 0644, /etc/modprobe.conf) +endif ifdef PTXCONF_ROOTFS_NSSWITCH_CONF @$(call install_alternative, rootfs, 0, 0, 0644, /etc/nsswitch.conf) endif |