Re: [ptxdist] [PATCH] add config and install symlink to let systemd load modules from /etc/modules

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Mon, Mar 26, 2012 at 02:51:50PM +0200, Alexander Dahl wrote:
> systemd can statically load kernel modules at boot. This is done by
> placing appropriate files *.conf in /etc/modules-load.d. To be
> compatible with initmethod-busybox (e.g. if you switch between both)
> just a symlink to /etc/modules is created like Debian does, too.

PTXdist doesn't really support switching the initmethod at runtime. I'd
prefer to just install /etc/modules-load.d/modules.conf. If you need both
you can add the symlink in projectroot.

Michael

> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
>  rules/initmethod-systemd.in   |   10 ++++++++--
>  rules/initmethod-systemd.make |    7 +++++++
>  2 files changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/initmethod-systemd.in b/rules/initmethod-systemd.in
> index 07010b4..20a2f43 100644
> --- a/rules/initmethod-systemd.in
> +++ b/rules/initmethod-systemd.in
> @@ -11,6 +11,12 @@ config INITMETHOD_SYSTEMD_IFUPDOWN
>  	help
>  	  Enable this to install services to handle networks with ifup/ifdown
>  
> -endif
> -
> +config INITMETHOD_SYSTEMD_MODULES_LOAD
> +	bool
> +	prompt "load kernel modules at boot time"
> +	help
> +	  Installs /etc/modules and links /etc/modules-load.d/modules.conf
> +	  to it for statically loading kernel modules at boot time. This is
> +	  the hacked systemd equivalent of /etc/init.d/modules ...
>  
> +endif
> diff --git a/rules/initmethod-systemd.make b/rules/initmethod-systemd.make
> index 4a0667f..c3abee8 100644
> --- a/rules/initmethod-systemd.make
> +++ b/rules/initmethod-systemd.make
> @@ -53,6 +53,13 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD_IFUPDOWN
>  	@$(call install_copy, initmethod-systemd, 0, 0, 0755, /etc/network/if-pre-up.d)
>  endif
>  
> +ifdef PTXCONF_INITMETHOD_SYSTEMD_MODULES_LOAD
> +	@$(call install_alternative, initmethod-systemd, 0, 0, 0644, \
> +		/etc/modules)
> +	@$(call install_link, initmethod-systemd, ../modules, \
> +		/etc/modules-load.d/modules.conf)
> +endif
> +
>  	@$(call install_finish,initmethod-systemd)
>  
>  	@$(call touch)
> -- 
> 1.7.2.5
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de