diff mbox series

[master/kirkstone,1/2] bt-enable: unbreak initscript

Message ID 20231201204427.19192-1-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master/kirkstone,1/2] bt-enable: unbreak initscript | expand

Commit Message

Denys Dmytriyenko Dec. 1, 2023, 8:44 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

This was using a SysVinit initscript that was also called from a systemd
unit file when systemd-compat-units were enabled. With systemd and
SysVinit now fully separated in Arago, adjust initscripts accordingly to
work for both init managers.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-connectivity/bt-enable/bt-enable.bb  | 16 +++++++++++-----
 .../bt-enable/bt-enable/bt-enable.service        |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb
index 9759e688..cb7fa93f 100644
--- a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb
+++ b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb
@@ -21,9 +21,15 @@  SYSTEMD_SERVICE:${PN} = "bt-enable.service"
 RDEPENDS:${PN} += "bash"
 
 do_install () {
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 bt-enable.sh ${D}${sysconfdir}/init.d/
-
-	install -d ${D}${systemd_system_unitdir}
-	install -m0644 bt-enable.service ${D}${systemd_system_unitdir}
+	if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+		install -d ${D}${sysconfdir}/init.d
+		install -m 0755 bt-enable.sh ${D}${sysconfdir}/init.d/
+	fi
+
+	if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+		install -d ${D}${bindir}
+		install -d ${D}${systemd_system_unitdir}
+		install -m 0755 bt-enable.sh ${D}${bindir}
+		install -m 0644 bt-enable.service ${D}${systemd_system_unitdir}
+	fi
 }
diff --git a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable/bt-enable.service b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable/bt-enable.service
index 2bde23ad..9ba631a7 100644
--- a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable/bt-enable.service
+++ b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable/bt-enable.service
@@ -4,8 +4,8 @@  After=network.target
 
 [Service]
 Type=oneshot
-ExecStart=/etc/init.d/bt-enable.sh
-WorkingDirectory=/etc/init.d
+ExecStart=/usr/bin/bt-enable.sh
+WorkingDirectory=/usr/bin
 StandardOutput=syslog
 
 [Install]