diff options
| author | Lee Duncan <lduncan@suse.com> | 2021-09-30 13:26:48 -0700 |
|---|---|---|
| committer | Lee Duncan <lduncan@suse.com> | 2021-09-30 13:26:48 -0700 |
| commit | fff82c57f5dfe6d3db795f1195b4d2ebc497d33c (patch) | |
| tree | e9946cd5e909201b7f3c2ac06c27e2c3f12611e8 | |
| parent | 3a920cda8aa7f0e67bca834d278da5167862a404 (diff) | |
| download | open-iscsi-fff82c57f5dfe6d3db795f1195b4d2ebc497d33c.tar.gz | |
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.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | etc/systemd/iscsi-init.service | 2 | ||||
| -rw-r--r-- | etc/systemd/iscsi.service | 6 | ||||
| -rw-r--r-- | etc/systemd/iscsid.service | 2 | ||||
| -rw-r--r-- | etc/systemd/iscsiuio.service | 2 |
5 files changed, 10 insertions, 6 deletions
@@ -114,6 +114,10 @@ install_udev_rules: install_systemd: $(INSTALL) -d $(DESTDIR)$(systemddir) $(INSTALL) -m 644 $(SYSTEMDFILES) $(DESTDIR)/$(systemddir) + for f in $(SYSTEMDFILES); do \ + p=$(DESTDIR)/$(systemddir)/system/$${f##*/}; \ + sed -i -e 's:@SBINDIR@:$(sbindir):' $$p; \ + done install_programs: $(PROGRAMS) $(SCRIPTS) $(INSTALL) -d $(DESTDIR)$(sbindir) 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 |