summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorLee Duncan <lduncan@suse.com>2020-03-04 12:59:10 -0800
committerLee Duncan <lduncan@suse.com>2020-03-04 12:59:10 -0800
commit6a9b0728c55b8ad5c6d5dba3f38697eded09538a (patch)
tree1f21a2bc36e4b51362fad5748b2797fb77cc331a /etc
parentac87641cd3d87b38480e212e7bdff7a44810036d (diff)
downloadopen-iscsi-6a9b0728c55b8ad5c6d5dba3f38697eded09538a.tar.gz
Fix iscsi.service so it handles restarts better
Requiring iscsid.service means that a restart of iscsi.service restarted iscsid.service when unneccesary. Also, we should treat an exit value of 15 as normal, since this just means the session is already present. It should rely on iscsid.socket, no iscsid.service.
Diffstat (limited to 'etc')
-rw-r--r--etc/systemd/iscsi.service4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
index e475888..1c286d1 100644
--- a/etc/systemd/iscsi.service
+++ b/etc/systemd/iscsi.service
@@ -3,7 +3,7 @@ Description=Login and scanning of iSCSI devices
Documentation=man:iscsiadm(8) man:iscsid(8)
Before=remote-fs.target
After=network.target network-online.target iscsid.service
-Requires=iscsid.service
+Requires=iscsid.socket
ConditionPathExists=/etc/iscsi/initiatorname.iscsi
[Service]
@@ -11,7 +11,7 @@ Type=oneshot
ExecStart=/sbin/iscsiadm -m node --loginall=automatic
ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
ExecStop=/sbin/iscsiadm -m node --logoutall=manual
-SuccessExitStatus=21
+SuccessExitStatus=21 15
RemainAfterExit=true
[Install]