1 From 8f79529354b4023c371e00091f11bdd523497639 Mon Sep 17 00:00:00 2001
2 From: Chris Leech <cleech@redhat.com>
3 Date: Mon, 19 Aug 2013 07:18:25 -0700
4 Subject: iscsi boot related service file updates
6 make sure iscsid gets started if there are any boot sessions running
7 add reload target to fix double session problem when restarting from NM
8 don't rely on session list passed from initrd, never got fully implemented
10 etc/systemd/iscsi-mark-root-nodes | 13 +++++++++++++
11 etc/systemd/iscsi.service | 3 ++-
12 etc/systemd/iscsi_mark_root_nodes | 14 --------------
13 3 files changed, 15 insertions(+), 15 deletions(-)
14 create mode 100644 etc/systemd/iscsi-mark-root-nodes
15 delete mode 100644 etc/systemd/iscsi_mark_root_nodes
17 diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
19 index 0000000..157be62
21 +++ b/etc/systemd/iscsi-mark-root-nodes
25 +ISCSIADM=/sbin/iscsiadm
27 +$ISCSIADM -m session >/dev/null 2>&1 || exit 0
29 +$ISCSIADM -m session | while read t num i target; do
31 + $ISCSIADM -m node -p $ip -T $target -o update -n node.startup -v onboot
34 +systemctl start iscsid.service
36 diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
37 index 7b4efee..d5712bd 100644
38 --- a/etc/systemd/iscsi.service
39 +++ b/etc/systemd/iscsi.service
40 @@ -10,10 +10,11 @@ ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
44 -ExecStart=/usr/libexec/iscsi_mark_root_nodes
45 +ExecStart=/usr/libexec/iscsi-mark-root-nodes
46 ExecStart=/sbin/iscsiadm -m node --loginall=automatic
48 ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
49 +ExecReload=/sbin/iscsiadm -m node --loginall=automatic
52 WantedBy=sysinit.target
53 diff --git a/etc/systemd/iscsi_mark_root_nodes b/etc/systemd/iscsi_mark_root_nodes
54 deleted file mode 100644
55 index c68475c..0000000
56 --- a/etc/systemd/iscsi_mark_root_nodes
61 -ISCSIADM=/sbin/iscsiadm
62 -SESSION_FILE=/run/initramfs/iscsi.sessions
64 -if [ ! -f $SESSION_FILE ] ; then
68 -while read t num i target; do
70 - $ISCSIADM -m node -p $ip -T $target -o update -n node.startup -v onboot