From fff82c57f5dfe6d3db795f1195b4d2ebc497d33c Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Thu, 30 Sep 2021 13:26:48 -0700
Subject: Use "sbindir" for path in systemd service files

Use a variable for the sbin directory where executables
go in our systemd unit files, so that the files can
be configured, during installation, to have the
correct path, instead of just hard-coding these paths.

Now "make sbindir=/SOME/PATH ..." works correctly for
different paths.
---
 etc/systemd/iscsi-init.service | 2 +-
 etc/systemd/iscsi.service      | 6 +++---
 etc/systemd/iscsid.service     | 2 +-
 etc/systemd/iscsiuio.service   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'etc')

diff --git a/etc/systemd/iscsi-init.service b/etc/systemd/iscsi-init.service
index eab4ff2..4c47d9d 100644
--- a/etc/systemd/iscsi-init.service
+++ b/etc/systemd/iscsi-init.service
@@ -6,4 +6,4 @@ DefaultDependencies=no
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
+ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`@SBINDIR@/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
index 5e394b9..6becab4 100644
--- a/etc/systemd/iscsi.service
+++ b/etc/systemd/iscsi.service
@@ -8,9 +8,9 @@ Wants=network-online.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/iscsiadm -m node --loginall=automatic -W
-ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
-ExecStop=/sbin/iscsiadm -m node --logoutall=manual
+ExecStart=@SBINDIR@/iscsiadm -m node --loginall=automatic -W
+ExecStop=@SBINDIR@/iscsiadm -m node --logoutall=automatic
+ExecStop=@SBINDIR@/iscsiadm -m node --logoutall=manual
 SuccessExitStatus=21 15
 RemainAfterExit=true
 
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
index 3fd7dd3..e2a50d3 100644
--- a/etc/systemd/iscsid.service
+++ b/etc/systemd/iscsid.service
@@ -10,7 +10,7 @@ Requires=iscsi-init.service
 [Service]
 Type=notify
 NotifyAccess=main
-ExecStart=/sbin/iscsid -f
+ExecStart=@SBINDIR@/iscsid -f
 KillMode=mixed
 Restart=on-failure
 
diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
index 923e019..2e721fe 100644
--- a/etc/systemd/iscsiuio.service
+++ b/etc/systemd/iscsiuio.service
@@ -12,7 +12,7 @@ Wants=remote-fs-pre.target
 [Service]
 Type=notify
 NotifyAccess=main
-ExecStart=/sbin/iscsiuio -f
+ExecStart=@SBINDIR@/iscsiuio -f
 KillMode=mixed
 Restart=on-failure
 
-- 
cgit v1.2.1