summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2012-01-07 04:51:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-10 17:28:44 (GMT)
commitf164a95b43fdda1e774195622f31f0cd998138d3 (patch)
treed41569422ab018e9bc59b0726546b4c3b41eceb9
parent118a0afe1ad766d80aee64792ca2cafbecbf4854 (diff)
downloadpoky-f164a95b43fdda1e774195622f31f0cd998138d3.tar.gz
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 <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 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
181mv "$MODCONFTMPFILE" "$MODCONFFILE" 181mv "$MODCONFTMPFILE" "$MODCONFFILE"
182mv "$MODULESTMPFILE" "$MODULESFILE" 182mv "$MODULESTMPFILE" "$MODULESFILE"
183 183
184if [ $first_time -eq 1 ]; then 184# Don't run modutils.sh if systemd is installed
185if [ $first_time -eq 1 ] && [ ! -e /bin/systemctl ]; then
185 /etc/init.d/modutils.sh || true 186 /etc/init.d/modutils.sh || true
186fi 187fi
187 188
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"
4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" 4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
5 5
6RDEPENDS_${PN} = "module-init-tools-depmod" 6RDEPENDS_${PN} = "module-init-tools-depmod"
7PR = "r11" 7
8PR = "r12"
8 9
9SRC_URI = "file://update-modules \ 10SRC_URI = "file://update-modules \
10 file://COPYING.GPL" 11 file://COPYING.GPL"