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

systemd has its own mechanism for loading kernel modules at startup

Signed-off-by: Steve Sakoman <steve@sakoman.com>

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 636fe1c0d4c5f20e139db174bc23f137b0ee5203..7ee7df81924ac958085403a828099dd69c6ef912 100755 (executable)
--- 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 dc4496507efebfbd46d961aecd158dcc3a62a26b..d9697de6c35cede0045e00c5ada1b77f8961e0f7 100644 (file)
--- 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"