summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2012-01-06 20:51:55 -0800
committerSaul Wold <sgw@linux.intel.com>2012-01-09 21:51:50 -0800
commit553deffc8040afabd56b1c1d87a8a8d24bbae5d0 (patch)
tree1ba504f436acba3db299b774a8a7dd07515e6c9e /meta
parentb3bb99c6faaf5c1613246309fd05cd95c39c77f4 (diff)
downloadopenembedded-core-553deffc8040afabd56b1c1d87a8a8d24bbae5d0.tar.gz
openembedded-core-553deffc8040afabd56b1c1d87a8a8d24bbae5d0.tar.bz2
openembedded-core-553deffc8040afabd56b1c1d87a8a8d24bbae5d0.tar.xz
openembedded-core-553deffc8040afabd56b1c1d87a8a8d24bbae5d0.zip
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>
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-kernel/update-modules/update-modules-1.0/update-modules3
-rw-r--r--meta/recipes-kernel/update-modules/update-modules_1.0.bb3
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 636fe1c0d..7ee7df819 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 dc4496507..d9697de6c 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"