Patchwork [CONSOLIDATED,PULL,10/22] update-modules: don't run modutils.sh if systemd is installed

login
mail settings
Submitter Saul Wold
Date Jan. 10, 2012, 5:54 a.m.
Message ID <553deffc8040afabd56b1c1d87a8a8d24bbae5d0.1326174744.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/18845/
State New
Headers show

Comments

Saul Wold - Jan. 10, 2012, 5:54 a.m.
From: Steve Sakoman <steve@sakoman.com>

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(-)

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"