From 6a4e4dcee814c7cfc22e0f69a6dc510086cb7abf Mon Sep 17 00:00:00 2001
From: Jakob Hauser <jahau@rocketmail.com>
Date: Sat, 5 Oct 2024 09:24:53 +0200
Subject: [PATCH] openrc|systemd: adapt install paths of scripts to /usr merge
The Makefile was previously changed to install the scripts according to
the /usr merge. As the service files point to the scripts, the paths
need to be adapted there as well.
---
openrc/swclock-offset-boot.initd | 2 +-
openrc/swclock-offset-shutdown.initd | 2 +-
systemd/swclock-offset-boot.service | 2 +-
systemd/swclock-offset-shutdown.service | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openrc/swclock-offset-boot.initd b/openrc/swclock-offset-boot.initd
index 34ec4b2..426bc36 100644
--- a/openrc/swclock-offset-boot.initd
+++ b/openrc/swclock-offset-boot.initd
@@ -13,7 +13,7 @@ depend()
start()
{
ebegin "Setting system time"
- /sbin/swclock-offset-boot
+ /usr/bin/swclock-offset-boot
eend $?
}
diff --git a/openrc/swclock-offset-shutdown.initd b/openrc/swclock-offset-shutdown.initd
index ddd9e3c..74837e4 100644
--- a/openrc/swclock-offset-shutdown.initd
+++ b/openrc/swclock-offset-shutdown.initd
@@ -19,7 +19,7 @@ depend()
start()
{
ebegin "Saving swclock-offset"
- /sbin/swclock-offset-shutdown
+ /usr/bin/swclock-offset-shutdown
eend $?
}
diff --git a/systemd/swclock-offset-boot.service b/systemd/swclock-offset-boot.service
index cb6636d..87385af 100644
--- a/systemd/swclock-offset-boot.service
+++ b/systemd/swclock-offset-boot.service
@@ -6,7 +6,7 @@ Before=systemd-fsck-root.service systemd-fsck@.service
[Service]
Type=oneshot
TimeoutSec=0
-ExecStart=/usr/sbin/swclock-offset-boot
+ExecStart=/usr/bin/swclock-offset-boot
[Install]
WantedBy=sysinit.target
diff --git a/systemd/swclock-offset-shutdown.service b/systemd/swclock-offset-shutdown.service
index 3158803..0d35148 100644
--- a/systemd/swclock-offset-shutdown.service
+++ b/systemd/swclock-offset-shutdown.service
@@ -6,7 +6,7 @@ Before=shutdown.target
[Service]
Type=oneshot
TimeoutSec=0
-ExecStart=/usr/sbin/swclock-offset-shutdown
+ExecStart=/usr/bin/swclock-offset-shutdown
[Install]
WantedBy=shutdown.target
--
GitLab