* [PATCH] update-modules: don't run modutils.sh if systemd is installed
@ 2012-01-07 4:51 Steve Sakoman
2012-01-12 6:28 ` Saul Wold
2012-02-16 1:53 ` Kelvin Lawson
0 siblings, 2 replies; 3+ messages in thread
From: Steve Sakoman @ 2012-01-07 4:51 UTC (permalink / raw)
To: openembedded-core; +Cc: Steve Sakoman
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"
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] update-modules: don't run modutils.sh if systemd is installed
2012-01-07 4:51 [PATCH] update-modules: don't run modutils.sh if systemd is installed Steve Sakoman
@ 2012-01-12 6:28 ` Saul Wold
2012-02-16 1:53 ` Kelvin Lawson
1 sibling, 0 replies; 3+ messages in thread
From: Saul Wold @ 2012-01-12 6:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Steve Sakoman
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!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] update-modules: don't run modutils.sh if systemd is installed
2012-01-07 4:51 [PATCH] update-modules: don't run modutils.sh if systemd is installed Steve Sakoman
2012-01-12 6:28 ` Saul Wold
@ 2012-02-16 1:53 ` Kelvin Lawson
1 sibling, 0 replies; 3+ messages in thread
From: Kelvin Lawson @ 2012-02-16 1:53 UTC (permalink / raw)
To: openembedded-core
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-16 2:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-07 4:51 [PATCH] update-modules: don't run modutils.sh if systemd is installed Steve Sakoman
2012-01-12 6:28 ` Saul Wold
2012-02-16 1:53 ` Kelvin Lawson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.