From f164a95b43fdda1e774195622f31f0cd998138d3 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Fri, 6 Jan 2012 20:51:55 -0800 Subject: update-modules: don't run modutils.sh if systemd is installed systemd has its own mechanism for loading kernel modules at startup (From OE-Core rev: 553deffc8040afabd56b1c1d87a8a8d24bbae5d0) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-kernel/update-modules/update-modules-1.0/update-modules | 3 ++- meta/recipes-kernel/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 636fe1c0d4..7ee7df8192 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 dc4496507e..d9697de6c3 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" -- cgit v1.2.3-54-g00ecf