From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay03.ispgateway.de ([80.67.31.26]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1RnGGb-00033Z-77 for ptxdist@pengutronix.de; Tue, 17 Jan 2012 22:08:31 +0100 Received: from [93.104.147.2] (helo=galilei.fritz.box) by smtprelay03.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1RnGGa-0006bK-Qb for ptxdist@pengutronix.de; Tue, 17 Jan 2012 22:08:28 +0100 From: Bernhard Walle Date: Tue, 17 Jan 2012 22:08:24 +0100 Message-Id: <1326834504-53984-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH] rootfs: Allow installation of /etc/modprobe.conf Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de 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 --- rules/rootfs.in | 10 ++++++++++ rules/rootfs.make | 3 +++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/rules/rootfs.in b/rules/rootfs.in index ecc3bf8..d8777c2 100644 --- a/rules/rootfs.in +++ b/rules/rootfs.in @@ -395,5 +395,15 @@ config ROOTFS_SERVICES If enabled, it installs the "./projectroot/etc/services" file if present, else a generic one from the ptxdist directory. +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. + endmenu diff --git a/rules/rootfs.make b/rules/rootfs.make index ca7d3f4..e6187fc 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -226,6 +226,9 @@ endif ifdef PTXCONF_ROOTFS_SERVICES @$(call install_alternative, rootfs, 0, 0, 0644, /etc/services) endif +ifdef PTXCONF_ROOTFS_MODPROBE_CONF + @$(call install_alternative, rootfs, 0, 0, 0644, /etc/modprobe.conf) +endif @$(call install_finish, rootfs) -- 1.7.7.4 -- ptxdist mailing list ptxdist@pengutronix.de