diff options
author | Steve Sakoman <steve@sakoman.com> | 2012-01-06 20:51:55 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-10 17:28:44 +0000 |
commit | f164a95b43fdda1e774195622f31f0cd998138d3 (patch) | |
tree | d41569422ab018e9bc59b0726546b4c3b41eceb9 /meta/recipes-kernel/update-modules | |
parent | 118a0afe1ad766d80aee64792ca2cafbecbf4854 (diff) | |
download | ast2050-yocto-poky-f164a95b43fdda1e774195622f31f0cd998138d3.zip ast2050-yocto-poky-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>
Diffstat (limited to 'meta/recipes-kernel/update-modules')
-rwxr-xr-x | meta/recipes-kernel/update-modules/update-modules-1.0/update-modules | 3 | ||||
-rw-r--r-- | 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 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" |