From 631ea075f0d845e32c22af02c02820cfe40df4ff Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Tue, 28 May 2013 13:22:37 -0700 Subject: [PATCH] Don't have iscsiadm scan for autostart record if node db is empty (bug #951951) --- ...autostart-sessions-if-iscsi-is-not-u.patch | 30 +++++++++++++++++++ iscsi-initiator-utils.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch diff --git a/0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch b/0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch new file mode 100644 index 0000000..684463f --- /dev/null +++ b/0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch @@ -0,0 +1,30 @@ +From ab79bdb20e37216ca969e06d63a952acfd023963 Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Tue, 28 May 2013 13:12:27 -0700 +Subject: [PATCH] Don't check for autostart sessions if iscsi is not used (bug + #951951) + +Change conditional startup in iscsi.service to check for a non-empty +nodes directory, instead of initiator-name. This fits better with what +it's doing, as there's no need to scan for autostart node records if +there are no node records at all. +--- + etc/systemd/iscsi.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service +index bbd52fd..7b4efee 100644 +--- a/etc/systemd/iscsi.service ++++ b/etc/systemd/iscsi.service +@@ -5,7 +5,7 @@ DefaultDependencies=no + Conflicts=shutdown.target + After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service + Before=remote-fs-pre.target +-ConditionPathExists=/etc/iscsi/initiatorname.iscsi ++ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes + + [Service] + Type=oneshot +-- +1.8.1.4 + diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 30c1b21..d56fa0e 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -7,7 +7,7 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 5%{?dist} +Release: 6%{?dist} Source0: http://www.open-iscsi.org/bits/open-iscsi-%{open_iscsi_version}-%{open_iscsi_build}.tar.gz Source1: iscsiuio-%{iscsiuio_version}.tar.gz Source4: 04-iscsi @@ -40,6 +40,7 @@ Patch58: 0058-iscsiuio-IPC-newroot-command.patch Patch59: 0059-iscsiuio-systemd-unit-files.patch Patch60: 0060-use-systemctl-to-start-iscsid.patch Patch61: 0061-resolve-565245-multilib-issues-caused-by-doxygen.patch +Patch62: 0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch # iscsiuio patches Patch71: 0071-iscsiuio-0.7.4.3.patch Patch72: 0072-iscsiuio-0.7.6.1.patch @@ -108,6 +109,7 @@ mv iscsiuio-%{iscsiuio_version} iscsiuio %patch59 -p1 %patch60 -p1 %patch61 -p1 +%patch62 -p1 # iscsiuio patches cd iscsiuio %patch71 -p1 @@ -264,6 +266,9 @@ fi %{_includedir}/libiscsi.h %changelog +* Tue May 28 2013 Chris Leech - 6.2.0.873-6 +- Don't have iscsiadm scan for autostart record if node db is empty (bug #951951) + * Tue Apr 30 2013 Orion Poplawski - 6.2.0.873-5 - Fix typo in NM dispatcher script (bug #917058)