1 From fd538429be486d057b092e3b9c148add2c5ea9c2 Mon Sep 17 00:00:00 2001
2 From: rpm-build <rpm-build>
3 Date: Tue, 4 Jun 2019 13:23:32 -0700
4 Subject: [PATCH 1/1] unit file tweaks
7 etc/systemd/iscsi-mark-root-nodes | 34 ++++++++++++++++++++++++++++++
8 etc/systemd/iscsi-onboot.service | 15 +++++++++++++
9 etc/systemd/iscsi-shutdown.service | 15 +++++++++++++
10 etc/systemd/iscsi.service | 16 +++++++-------
11 etc/systemd/iscsid.service | 3 +--
12 etc/systemd/iscsiuio.service | 4 +---
13 6 files changed, 74 insertions(+), 13 deletions(-)
14 create mode 100755 etc/systemd/iscsi-mark-root-nodes
15 create mode 100644 etc/systemd/iscsi-onboot.service
16 create mode 100644 etc/systemd/iscsi-shutdown.service
18 diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
20 index 0000000..9d48805
22 +++ b/etc/systemd/iscsi-mark-root-nodes
26 +ISCSIADM=/usr/sbin/iscsiadm
30 +while read t num p target flash; do
31 + # strip tag number from portal, keep "ip:port"
35 + # use session number to find the iface name in use
36 + num=${num#[}; num=${num%]}
37 + iface=$(iscsiadm -m session -r $num | grep iface.iscsi_ifacename | cut -d= -f2)
39 + $ISCSIADM -m node -p $portal -T $target -I $iface -o update -n node.startup -v onboot
43 + if [ "$transport" = bnx2i ] || [ "$transport" = qedi ]; then
46 +done < <( $ISCSIADM -m session )
48 +# force iscsid and iscsiuio to start if needed for
49 +# recovering sessions created in the initrd
51 +if [ "$start_iscsid" -eq 1 ]; then
52 + systemctl --no-block start iscsid.service
54 +if [ "$start_iscsiuio" -eq 1 ]; then
55 + systemctl --no-block start iscsiuio.service
58 diff --git a/etc/systemd/iscsi-onboot.service b/etc/systemd/iscsi-onboot.service
60 index 0000000..42ced68
62 +++ b/etc/systemd/iscsi-onboot.service
65 +Description=Special handling of early boot iSCSI sessions
66 +Documentation=man:iscsiadm(8) man:iscsid(8)
67 +DefaultDependencies=no
68 +RefuseManualStart=true
70 +After=systemd-remount-fs.service
71 +ConditionDirectoryNotEmpty=/sys/class/iscsi_session
75 +ExecStart=-/usr/libexec/iscsi-mark-root-nodes
78 +WantedBy=sysinit.target
79 diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
81 index 0000000..caee933
83 +++ b/etc/systemd/iscsi-shutdown.service
86 +Description=Logout off all iSCSI sessions on shutdown
87 +Documentation=man:iscsid(8) man:iscsiadm(8)
88 +DefaultDependencies=no
89 +Conflicts=shutdown.target
90 +After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
91 +Before=remote-fs-pre.target
92 +Wants=remote-fs-pre.target
98 +ExecStart=-/usr/bin/true
99 +ExecStop=-/usr/sbin/iscsiadm -m node --logoutall=all
100 diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
101 index 5e394b9..175cb2c 100644
102 --- a/etc/systemd/iscsi.service
103 +++ b/etc/systemd/iscsi.service
106 Description=Login and scanning of iSCSI devices
107 Documentation=man:iscsiadm(8) man:iscsid(8)
108 -Before=remote-fs.target
109 -After=network-online.target iscsid.service
110 -Requires=iscsid.socket iscsi-init.service
111 -Wants=network-online.target
112 +DefaultDependencies=no
113 +Before=remote-fs-pre.target
114 +After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
115 +Wants=remote-fs-pre.target iscsi-shutdown.service
116 +ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
120 -ExecStart=/sbin/iscsiadm -m node --loginall=automatic -W
121 -ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
122 -ExecStop=/sbin/iscsiadm -m node --logoutall=manual
123 -SuccessExitStatus=21 15
125 +ExecStart=-/usr/sbin/iscsiadm -m node --loginall=automatic
126 +ExecReload=-/usr/sbin/iscsiadm -m node --loginall=automatic
127 +SuccessExitStatus=21
130 WantedBy=remote-fs.target
131 diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
132 index 3fd7dd3..324c593 100644
133 --- a/etc/systemd/iscsid.service
134 +++ b/etc/systemd/iscsid.service
135 @@ -4,13 +4,12 @@ Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
136 DefaultDependencies=no
137 After=network-online.target iscsiuio.service iscsi-init.service
138 Before=remote-fs-pre.target
139 -Wants=remote-fs-pre.target
140 Requires=iscsi-init.service
145 -ExecStart=/sbin/iscsid -f
146 +ExecStart=/usr/sbin/iscsid -f
150 diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
151 index 923e019..fc0be93 100644
152 --- a/etc/systemd/iscsiuio.service
153 +++ b/etc/systemd/iscsiuio.service
155 Description=iSCSI UserSpace I/O driver
156 Documentation=man:iscsiuio(8)
157 DefaultDependencies=no
158 -Conflicts=shutdown.target
159 Requires=iscsid.service
160 BindTo=iscsid.service
162 Before=remote-fs-pre.target iscsid.service
163 -Wants=remote-fs-pre.target
168 -ExecStart=/sbin/iscsiuio -f
169 +ExecStart=/usr/sbin/iscsiuio -f