Patchwork update-modules: don't run modutils.sh if systemd is installed

login
register
mail settings
Submitter Steve Sakoman
Date Jan. 7, 2012, 4:51 a.m.
Message ID <1325911915-16001-5-git-send-email-steve@sakoman.com>
Download mbox | patch
Permalink /patch/18759/
State Accepted
Commit 553deffc8040afabd56b1c1d87a8a8d24bbae5d0
Headers show

Comments

Steve Sakoman - Jan. 7, 2012, 4:51 a.m.
systemd has its own mechanism for loading kernel modules at startup

Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 .../update-modules-1.0/update-modules              |    3 ++-
 .../update-modules/update-modules_1.0.bb           |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
Saul Wold - Jan. 12, 2012, 6:28 a.m.
On 01/06/2012 08:51 PM, Steve Sakoman wrote:
> systemd has its own mechanism for loading kernel modules at startup
>
> Signed-off-by: Steve Sakoman<steve@sakoman.com>
> ---
>   .../update-modules-1.0/update-modules              |    3 ++-
>   .../update-modules/update-modules_1.0.bb           |    3 ++-
>   2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
> index 636fe1c..7ee7df8 100755
> --- a/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
> +++ b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
> @@ -181,7 +181,8 @@ fi
>   mv "$MODCONFTMPFILE" "$MODCONFFILE"
>   mv "$MODULESTMPFILE" "$MODULESFILE"
>
> -if [ $first_time -eq 1 ]; then
> +# Don't run modutils.sh if systemd is installed
> +if [ $first_time -eq 1 ]&&  [ ! -e /bin/systemctl ]; then
>     /etc/init.d/modutils.sh || true
>   fi
>
> diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
> index dc44965..d9697de 100644
> --- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb
> +++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
> @@ -4,7 +4,8 @@ LICENSE = "GPLv2"
>   LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
>
>   RDEPENDS_${PN} = "module-init-tools-depmod"
> -PR = "r11"
> +
> +PR = "r12"
>
>   SRC_URI = "file://update-modules \
>              file://COPYING.GPL"

Merged into OE-Core

Thanks
	Sau!
Kelvin Lawson - Feb. 16, 2012, 1:53 a.m.
Hi,

> +# Don't run modutils.sh if systemd is installed
> +if [ $first_time -eq 1 ]&&  [ ! -e /bin/systemctl ]; then
>     /etc/init.d/modutils.sh || true
>   fi

I just came across this and was wondering what the situation is with 
respect to systemd's module loading. Is there actually a mechanism in 
place for populating systemd's /etc/modules-load.d folder?

The "module_autoload_xx" directives populate /etc/modutils but not 
/etc/modules-load.d. As far as I can tell this means that one still 
needs to include the old modutils.sh script to autoload modules (via 
modutils-initscripts package). With this patch, you need to boot the 
system twice in order for the kernel modules to be auto-loaded (because 
update-modules does not reload modutils.sh immediately after adding the 
modules).

Are we in a transition period where module-autoload is not yet 
implemented via the systemd method but update-modules doesn't quite play 
ball properly with that, or is there already a mechanism for populating 
modules-load.d that I haven't found yet? (Other than doing it by hand).

Thanks,
Kelvin.

Patch

diff --git a/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
index 636fe1c..7ee7df8 100755
--- a/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
+++ b/meta/recipes-kernel/update-modules/update-modules-1.0/update-modules
@@ -181,7 +181,8 @@  fi
 mv "$MODCONFTMPFILE" "$MODCONFFILE"
 mv "$MODULESTMPFILE" "$MODULESFILE"
 
-if [ $first_time -eq 1 ]; then
+# Don't run modutils.sh if systemd is installed
+if [ $first_time -eq 1 ] && [ ! -e /bin/systemctl ]; then
   /etc/init.d/modutils.sh || true
 fi
 
diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
index dc44965..d9697de 100644
--- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb
+++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
@@ -4,7 +4,8 @@  LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
 
 RDEPENDS_${PN} = "module-init-tools-depmod"
-PR = "r11"
+
+PR = "r12"
 
 SRC_URI = "file://update-modules \
            file://COPYING.GPL"