From patchwork Tue Jan 10 05:54:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 10/22] update-modules: don't run modutils.sh if systemd is installed Date: Tue, 10 Jan 2012 05:54:04 -0000 From: Saul Wold X-Patchwork-Id: 18845 Message-Id: <553deffc8040afabd56b1c1d87a8a8d24bbae5d0.1326174744.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Steve Sakoman systemd has its own mechanism for loading kernel modules at startup Signed-off-by: Steve Sakoman --- .../update-modules-1.0/update-modules | 3 ++- .../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"