|
 |
cd0a22 |
From 0c8744b08e717e011eb51fe663a4db33c9c0f9b0 Mon Sep 17 00:00:00 2001
|
|
|
cd0a22 |
From: rpm-build <rpm-build>
|
|
|
cd0a22 |
Date: Wed, 16 Oct 2019 16:27:38 -0700
|
|
|
cd0a22 |
Subject: [PATCH 1/1] Restore some service file differences
|
|
|
cd0a22 |
|
|
|
cd0a22 |
---
|
|
|
cd0a22 |
etc/systemd/iscsi.service | 13 +++++++++----
|
|
|
cd0a22 |
etc/systemd/iscsid.service | 1 +
|
|
|
cd0a22 |
etc/systemd/iscsiuio.service | 1 -
|
|
|
cd0a22 |
3 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
cd0a22 |
|
|
|
cd0a22 |
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
|
|
|
cd0a22 |
index 0edcf51..f09b3a0 100644
|
|
|
cd0a22 |
--- a/etc/systemd/iscsi.service
|
|
|
cd0a22 |
+++ b/etc/systemd/iscsi.service
|
|
|
cd0a22 |
@@ -1,15 +1,20 @@
|
|
|
cd0a22 |
[Unit]
|
|
|
cd0a22 |
Description=Login and scanning of iSCSI devices
|
|
|
cd0a22 |
Documentation=man:iscsiadm(8) man:iscsid(8)
|
|
|
cd0a22 |
-Before=remote-fs.target
|
|
|
cd0a22 |
-After=network.target network-online.target iscsid.service
|
|
|
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 |
|
|
|
cd0a22 |
[Service]
|
|
|
cd0a22 |
Type=oneshot
|
|
|
cd0a22 |
+ExecStart=-/usr/libexec/iscsi-mark-root-nodes
|
|
|
cd0a22 |
ExecStart=-/sbin/iscsiadm -m node --loginall=automatic
|
|
|
cd0a22 |
-ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
|
|
|
cd0a22 |
-ExecStop=/sbin/iscsiadm -m node --logoutall=manual
|
|
|
cd0a22 |
+ExecReload=-/sbin/iscsiadm -m node --loginall=automatic
|
|
|
cd0a22 |
SuccessExitStatus=21
|
|
|
cd0a22 |
RemainAfterExit=true
|
|
|
cd0a22 |
|
|
|
cd0a22 |
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
|
|
|
cd0a22 |
index f5e8979..4fef168 100644
|
|
|
cd0a22 |
--- a/etc/systemd/iscsid.service
|
|
|
cd0a22 |
+++ b/etc/systemd/iscsid.service
|
|
|
cd0a22 |
@@ -10,6 +10,7 @@ Type=notify
|
|
|
cd0a22 |
NotifyAccess=main
|
|
|
cd0a22 |
ExecStart=/sbin/iscsid -f
|
|
|
cd0a22 |
KillMode=mixed
|
|
|
cd0a22 |
+Restart=on-failure
|
|
|
cd0a22 |
|
|
|
cd0a22 |
[Install]
|
|
|
cd0a22 |
WantedBy=multi-user.target
|
|
|
cd0a22 |
diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
|
|
|
cd0a22 |
index e4d9fd0..48501b6 100644
|
|
|
cd0a22 |
--- a/etc/systemd/iscsiuio.service
|
|
|
cd0a22 |
+++ b/etc/systemd/iscsiuio.service
|
|
|
cd0a22 |
@@ -2,7 +2,6 @@
|
|
|
cd0a22 |
Description=iSCSI UserSpace I/O driver
|
|
|
cd0a22 |
Documentation=man:iscsiuio(8)
|
|
|
cd0a22 |
DefaultDependencies=no
|
|
|
cd0a22 |
-Conflicts=shutdown.target
|
|
|
cd0a22 |
Requires=iscsid.service
|
|
|
cd0a22 |
BindTo=iscsid.service
|
|
|
cd0a22 |
After=network.target
|
|
|
cd0a22 |
--
|
|
|
cd0a22 |
2.21.0
|
|
|
cd0a22 |
|