Skip to content
Snippets Groups Projects
Commit b3d0c4fc authored by Samuli Piippo's avatar Samuli Piippo
Browse files

dbus-session-init: fix broken init script


Change-Id: I3cefeb9b8c19dbd4f2e0bf9312088e6489b758c3
Reviewed-by: default avatarRisto Avila <risto.avila@qt.io>
parent 8c9bd4c1
No related branches found
No related tags found
No related merge requests found
......@@ -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]
......
......@@ -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/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment