summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorLee Duncan <lduncan@suse.com>2018-10-16 13:57:16 -0700
committerLee Duncan <lduncan@suse.com>2018-10-16 13:57:16 -0700
commit418e018edd6044d9563573f5ede529a2238584bd (patch)
tree714e2996ceda53988214bccfa56f5ece79001f98 /etc
parent93fb910880604fe9509e7efa7b8d32098fc0ef1f (diff)
downloadopen-iscsi-418e018edd6044d9563573f5ede529a2238584bd.tar.gz
Update systemd unit files for iscsid
Updates: * support iscsiuio * support iscsid/systemd notifcation * change kill mode for iscsi * make iscsid run in the foreground * tell iscsid.service about iscsid.socket
Diffstat (limited to 'etc')
-rw-r--r--etc/systemd/iscsid.service13
-rw-r--r--etc/systemd/iscsid.socket2
2 files changed, 9 insertions, 6 deletions
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
index 028e0b3..f5e8979 100644
--- a/etc/systemd/iscsid.service
+++ b/etc/systemd/iscsid.service
@@ -1,13 +1,16 @@
[Unit]
Description=Open-iSCSI
Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
-After=network.target NetworkManager-wait-online.service iscsiuio.service tgtd.service targetcli.service
+DefaultDependencies=no
+After=network.target iscsiuio.service
+Before=remote-fs-pre.target
[Service]
-Type=forking
-PIDFile=/var/run/iscsid.pid
-ExecStart=/usr/sbin/iscsid
-ExecStop=/sbin/iscsiadm -k 0 2
+Type=notify
+NotifyAccess=main
+ExecStart=/sbin/iscsid -f
+KillMode=mixed
[Install]
WantedBy=multi-user.target
+Also=iscsid.socket
diff --git a/etc/systemd/iscsid.socket b/etc/systemd/iscsid.socket
index 832451d..58a8d12 100644
--- a/etc/systemd/iscsid.socket
+++ b/etc/systemd/iscsid.socket
@@ -1,6 +1,6 @@
[Unit]
Description=Open-iSCSI iscsid Socket
-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
+Documentation=man:iscsid(8) man:iscsiadm(8)
[Socket]
ListenStream=@ISCSIADM_ABSTRACT_NAMESPACE