summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorLee Duncan <lduncan@suse.com>2021-03-11 10:54:55 -0800
committerLee Duncan <lduncan@suse.com>2021-03-11 10:54:55 -0800
commit224b310a5683c60d8d1051fd8a03775bf6b9f29a (patch)
tree58bbc342bcd68e3cc76e68442ab12e4e4db232ba /etc
parent0c0641401faae89e014ad06e4c175fd37bfc7b45 (diff)
downloadopen-iscsi-224b310a5683c60d8d1051fd8a03775bf6b9f29a.tar.gz
Enable iscsi.service asynchronous logins, cleanup services
Add the "-W" (no wait) flag to the iscsiadm login command in iscsi.service, so that the service succeeds even if one or more of the targets being logged on to is not available at startup time. Also, clean up the iscsi.service and iscsid.service files.
Diffstat (limited to 'etc')
-rw-r--r--etc/systemd/iscsi.service5
-rw-r--r--etc/systemd/iscsid.service3
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
index 5ceb25e..5e394b9 100644
--- a/etc/systemd/iscsi.service
+++ b/etc/systemd/iscsi.service
@@ -2,14 +2,13 @@
Description=Login and scanning of iSCSI devices
Documentation=man:iscsiadm(8) man:iscsid(8)
Before=remote-fs.target
-After=network.target network-online.target
-After=iscsid.service iscsi-init.service
+After=network-online.target iscsid.service
Requires=iscsid.socket iscsi-init.service
Wants=network-online.target
[Service]
Type=oneshot
-ExecStart=/sbin/iscsiadm -m node --loginall=automatic
+ExecStart=/sbin/iscsiadm -m node --loginall=automatic -W
ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
ExecStop=/sbin/iscsiadm -m node --logoutall=manual
SuccessExitStatus=21 15
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
index 648ceea..3fd7dd3 100644
--- a/etc/systemd/iscsid.service
+++ b/etc/systemd/iscsid.service
@@ -2,9 +2,10 @@
Description=Open-iSCSI
Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
DefaultDependencies=no
-After=network.target iscsiuio.service
+After=network-online.target iscsiuio.service iscsi-init.service
Before=remote-fs-pre.target
Wants=remote-fs-pre.target
+Requires=iscsi-init.service
[Service]
Type=notify