From b3d0c4fcb89a716b3f692e9e8ebcea651608bce1 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 26 Oct 2016 12:46:03 +0300
Subject: [PATCH] dbus-session-init: fix broken init script
Change-Id: I3cefeb9b8c19dbd4f2e0bf9312088e6489b758c3
Reviewed-by: Risto Avila <risto.avila@qt.io>
---
recipes/dbus/dbus/dbus-session.service | 4 ++--
recipes/dbus/dbus_%.bbappend | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/recipes/dbus/dbus/dbus-session.service b/recipes/dbus/dbus/dbus-session.service
index dbd6fcd8..8dcf081a 100644
--- a/recipes/dbus/dbus/dbus-session.service
+++ b/recipes/dbus/dbus/dbus-session.service
@@ -4,8 +4,8 @@ After=dbus.service
[Service]
Type=forking
-ExecStart=/usr/bin/dbus-session.init start
-ExecStop=/usr/bin/dbus-session.init stop
+ExecStart=/usr/bin/dbus-session.init.sh start
+ExecStop=/usr/bin/dbus-session.init.sh stop
Environment=HOME=/home/root
[Install]
diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend
index f9f1345d..dde2927b 100644
--- a/recipes/dbus/dbus_%.bbappend
+++ b/recipes/dbus/dbus_%.bbappend
@@ -45,21 +45,21 @@ SYSTEMD_PACKAGES =+ "${PN}-session-init"
FILES_${PN}-session-init = " \
${sysconfdir}/init.d/dbus-session \
${sysconfdir}/profile.d/dbus-session-address \
- ${bindir}/dbus-session.init \
+ ${bindir}/dbus-session.init.sh \
${systemd_unitdir}/system/dbus-session.service \
"
do_install_append_class-target() {
- sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init
+ sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh
if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/dbus-session.init ${D}${sysconfdir}/init.d/dbus-session
+ install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session
fi
if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -m 0755 -d ${D}${bindir}/
- install -m 0755 ${WORKDIR}/dbus-session.init ${D}${bindir}/
+ install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${bindir}/
install -m 0755 -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/dbus-session.service ${D}${systemd_unitdir}/system/
--
GitLab