|
 |
cd0a22 |
From 80603fd5378a7ec4e274188bd5582fa94ec69b27 Mon Sep 17 00:00:00 2001
|
|
|
cd0a22 |
From: rpm-build <rpm-build>
|
|
|
cd0a22 |
Date: Mon, 28 Oct 2019 10:20:56 -0700
|
|
|
cd0a22 |
Subject: [PATCH 1/1] improve systemd service files for boot session handling
|
|
|
cd0a22 |
|
|
|
cd0a22 |
---
|
|
|
cd0a22 |
etc/systemd/iscsi-mark-root-nodes | 6 +++++-
|
|
|
cd0a22 |
etc/systemd/iscsi-onboot.service | 15 +++++++++++++++
|
|
|
cd0a22 |
etc/systemd/iscsi.service | 8 ++------
|
|
|
cd0a22 |
3 files changed, 22 insertions(+), 7 deletions(-)
|
|
|
cd0a22 |
create mode 100644 etc/systemd/iscsi-onboot.service
|
|
|
cd0a22 |
|
|
|
cd0a22 |
diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
|
|
|
cd0a22 |
index 6bddf6c..cc76100 100644
|
|
|
cd0a22 |
--- a/etc/systemd/iscsi-mark-root-nodes
|
|
|
cd0a22 |
+++ b/etc/systemd/iscsi-mark-root-nodes
|
|
|
cd0a22 |
@@ -9,7 +9,11 @@ while read t num p target flash; do
|
|
|
cd0a22 |
portal=${p%,*}
|
|
|
cd0a22 |
transport=${t%:}
|
|
|
cd0a22 |
|
|
|
cd0a22 |
- $ISCSIADM -m node -p $portal -T $target -o update -n node.startup -v onboot
|
|
|
cd0a22 |
+ # use session number to find the iface name in use
|
|
|
cd0a22 |
+ num=${num#[}; num=${num%]}
|
|
|
cd0a22 |
+ iface=$(iscsiadm -m session -r $num | grep iface.iscsi_ifacename | cut -d= -f2)
|
|
|
cd0a22 |
+
|
|
|
cd0a22 |
+ $ISCSIADM -m node -p $portal -T $target -I $iface -o update -n node.startup -v onboot
|
|
|
cd0a22 |
|
|
|
cd0a22 |
start_iscsid=1
|
|
|
cd0a22 |
|
|
|
cd0a22 |
diff --git a/etc/systemd/iscsi-onboot.service b/etc/systemd/iscsi-onboot.service
|
|
|
cd0a22 |
new file mode 100644
|
|
|
cd0a22 |
index 0000000..42ced68
|
|
|
cd0a22 |
--- /dev/null
|
|
|
cd0a22 |
+++ b/etc/systemd/iscsi-onboot.service
|
|
|
cd0a22 |
@@ -0,0 +1,15 @@
|
|
|
cd0a22 |
+[Unit]
|
|
|
cd0a22 |
+Description=Special handling of early boot iSCSI sessions
|
|
|
cd0a22 |
+Documentation=man:iscsiadm(8) man:iscsid(8)
|
|
|
cd0a22 |
+DefaultDependencies=no
|
|
|
cd0a22 |
+RefuseManualStart=true
|
|
|
cd0a22 |
+Before=iscsi.service
|
|
|
cd0a22 |
+After=systemd-remount-fs.service
|
|
|
cd0a22 |
+ConditionDirectoryNotEmpty=/sys/class/iscsi_session
|
|
|
cd0a22 |
+
|
|
|
cd0a22 |
+[Service]
|
|
|
cd0a22 |
+Type=oneshot
|
|
|
cd0a22 |
+ExecStart=-/usr/libexec/iscsi-mark-root-nodes
|
|
|
cd0a22 |
+
|
|
|
cd0a22 |
+[Install]
|
|
|
cd0a22 |
+WantedBy=sysinit.target
|
|
|
cd0a22 |
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
|
|
|
cd0a22 |
index f09b3a0..1d52882 100644
|
|
|
cd0a22 |
--- a/etc/systemd/iscsi.service
|
|
|
cd0a22 |
+++ b/etc/systemd/iscsi.service
|
|
|
cd0a22 |
@@ -2,21 +2,17 @@
|
|
|
cd0a22 |
Description=Login and scanning of iSCSI devices
|
|
|
cd0a22 |
Documentation=man:iscsiadm(8) man:iscsid(8)
|
|
|
cd0a22 |
DefaultDependencies=no
|
|
|
cd0a22 |
-Conflicts=shutdown.target
|
|
|
cd0a22 |
Before=remote-fs-pre.target
|
|
|
cd0a22 |
After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
|
|
|
cd0a22 |
Wants=remote-fs-pre.target iscsi-shutdown.service
|
|
|
cd0a22 |
-ConditionPathExists=/etc/iscsi/initiatorname.iscsi
|
|
|
cd0a22 |
-ConditionDirectoryNotEmpty=|/var/lib/iscsi/nodes
|
|
|
cd0a22 |
-ConditionDirectoryNotEmpty=|/sys/class/iscsi_session
|
|
|
cd0a22 |
+ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
|
|
|
cd0a22 |
|
|
|
cd0a22 |
[Service]
|
|
|
cd0a22 |
Type=oneshot
|
|
|
cd0a22 |
-ExecStart=-/usr/libexec/iscsi-mark-root-nodes
|
|
|
cd0a22 |
+RemainAfterExit=true
|
|
|
cd0a22 |
ExecStart=-/sbin/iscsiadm -m node --loginall=automatic
|
|
|
cd0a22 |
ExecReload=-/sbin/iscsiadm -m node --loginall=automatic
|
|
|
cd0a22 |
SuccessExitStatus=21
|
|
|
cd0a22 |
-RemainAfterExit=true
|
|
|
cd0a22 |
|
|
|
cd0a22 |
[Install]
|
|
|
cd0a22 |
WantedBy=remote-fs.target
|
|
|
cd0a22 |
--
|
|
|
cd0a22 |
2.21.0
|
|
|
cd0a22 |
|