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