|
 |
62f653 |
From 3815643d7db65487fa2b7058dd612ddf2549f85a Mon Sep 17 00:00:00 2001
|
|
|
62f653 |
From: rpm-build <rpm-build>
|
|
|
62f653 |
Date: Tue, 13 Jan 2015 16:30:01 -0800
|
|
|
62f653 |
Subject: [PATCH 17/32] make-session-shutdown-a-seperate-service.patch
|
|
|
62f653 |
|
|
|
62f653 |
---
|
|
|
62f653 |
etc/systemd/iscsi-shutdown.service | 14 ++++++++++++++
|
|
|
62f653 |
etc/systemd/iscsi.service | 3 +--
|
|
|
62f653 |
2 files changed, 15 insertions(+), 2 deletions(-)
|
|
|
62f653 |
create mode 100644 etc/systemd/iscsi-shutdown.service
|
|
|
62f653 |
|
|
|
62f653 |
diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
|
|
|
62f653 |
new file mode 100644
|
|
|
62f653 |
index 000000000000..23758e959ff2
|
|
|
62f653 |
--- /dev/null
|
|
|
62f653 |
+++ b/etc/systemd/iscsi-shutdown.service
|
|
|
62f653 |
@@ -0,0 +1,14 @@
|
|
|
62f653 |
+[Unit]
|
|
|
62f653 |
+Description=Logout off all iSCSI sessions on shutdown
|
|
|
62f653 |
+Documentation=man:iscsid(8) man:iscsiadm(8)
|
|
|
62f653 |
+DefaultDependencies=no
|
|
|
62f653 |
+Conflicts=shutdown.target
|
|
|
62f653 |
+After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
|
|
|
62f653 |
+Before=remote-fs-pre.target
|
|
|
62f653 |
+Wants=remote-fs-pre.target
|
|
|
62f653 |
+RefuseManualStop=yes
|
|
|
62f653 |
+
|
|
|
62f653 |
+[Service]
|
|
|
62f653 |
+Type=oneshot
|
|
|
62f653 |
+RemainAfterExit=true
|
|
|
62f653 |
+ExecStop=-/sbin/iscsiadm -m node --logoutall=all
|
|
|
62f653 |
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
|
|
|
62f653 |
index ad7be34d5918..27369568bf35 100644
|
|
|
62f653 |
--- a/etc/systemd/iscsi.service
|
|
|
62f653 |
+++ b/etc/systemd/iscsi.service
|
|
|
62f653 |
@@ -5,7 +5,7 @@ DefaultDependencies=no
|
|
|
62f653 |
Conflicts=shutdown.target
|
|
|
62f653 |
After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
|
|
|
62f653 |
Before=remote-fs-pre.target
|
|
|
62f653 |
-Wants=remote-fs-pre.target
|
|
|
62f653 |
+Wants=remote-fs-pre.target iscsi-shutdown.service
|
|
|
62f653 |
ConditionDirectoryNotEmpty=|/var/lib/iscsi/nodes
|
|
|
62f653 |
ConditionDirectoryNotEmpty=|/sys/class/iscsi_session
|
|
|
62f653 |
|
|
|
62f653 |
@@ -14,7 +14,6 @@ Type=oneshot
|
|
|
62f653 |
RemainAfterExit=true
|
|
|
62f653 |
ExecStart=-/usr/libexec/iscsi-mark-root-nodes
|
|
|
62f653 |
ExecStart=-/sbin/iscsiadm -m node --loginall=automatic
|
|
|
62f653 |
-ExecStop=-/sbin/iscsiadm -m node --logoutall=automatic
|
|
|
62f653 |
ExecReload=-/sbin/iscsiadm -m node --loginall=automatic
|
|
|
62f653 |
|
|
|
62f653 |
[Install]
|
|
|
62f653 |
--
|
|
|
62f653 |
2.14.4
|
|
|
62f653 |
|