[iscsi-initiator-utils: 4/4] sync with upstream v2.0.873-84-gc9d830b
Chris Leech
cleech at fedoraproject.org
Fri Oct 24 00:08:26 UTC 2014
commit c30d436535c38f74f25c440074710930d48874a1
Merge: 8bdd644 df66fcb
Author: Chris Leech <cleech at redhat.com>
Date: Thu Oct 23 17:03:51 2014 -0700
sync with upstream v2.0.873-84-gc9d830b
ignore iscsiadm return in iscsi.service
make sure systemd order against remote mounts is correct
add discovery as a valid mode in iscsiadm.8
make sure to pass --with-security=no to isns configure
...x-the-hostno-check-for-stats-submode-of-h.patch | 30 +++
0072-iscsiadm-Fix-the-compile-time-warning.patch | 31 +++
...iscsid-Fix-handling-of-iscsi-async-events.patch | 56 ++++++
...iscsi-Fix-MaxXmitDataLenght-of-the-driver.patch | 41 ++++
0076-Fix-StatSN-in-Open-iSCSI-Stack.patch | 61 ++++++
...-retry-login-for-ISCSI_ERR_HOST_NOT_FOUND.patch | 207 ++++++++++++++++++++
0078-iscsid-Fix-double-close-of-mgmt-ipc-fd.patch | 28 +++
...itialize-param_count-in-set_host_chap_inf.patch | 27 +++
...ke-iface.ipaddress-optional-in-iface-conf.patch | 100 ++++++++++
0082-Remove-unused-variable-path.patch | 33 +++
0083-Parse-origin-value-from-iBFT.patch | 81 ++++++++
...-docs-for-deregistering-discovery-domains.patch | 63 ++++++
...d-discovery-as-a-valid-mode-in-iscsiadm.8.patch | 36 ++++
0152-use-var-for-config.patch | 50 +++---
0170-fix-systemd-unit-wants.patch | 41 ++++
...-version-string-to-match-RPM-package-vers.patch | 2 +-
iscsi-initiator-utils.spec | 69 ++++++-
17 files changed, 922 insertions(+), 34 deletions(-)
---
diff --cc 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
index 1af14f0,cda6f98..747c9da
--- a/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+++ b/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
@@@ -16,7 -16,7 +16,7 @@@ index a090522..aef0c3d 10064
* some other maintainer could merge a patch without going through us
*/
-#define ISCSI_VERSION_STR "2.0-873"
- +#define ISCSI_VERSION_STR "6.2.0.873-21"
-+#define ISCSI_VERSION_STR "6.2.0.873-22"
+++#define ISCSI_VERSION_STR "6.2.0.873-24"
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
#endif
diff --cc iscsi-initiator-utils.spec
index bf9eee1,e1f665d..ab5e6e6
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@@ -1,10 -1,10 +1,11 @@@
--%define open_iscsi_version 2.0
--%define open_iscsi_build 873
++%global open_iscsi_version 2.0
++%global open_iscsi_build 873
++%global checkout c9d830b
Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils
Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
--Release: 23%{?dist}
++Release: 24.git%{checkout}%{?dist}
Group: System Environment/Daemons
License: GPLv2+
URL: http://www.open-iscsi.org
@@@ -360,6 -384,27 +385,27 @@@ f
/bin/systemctl try-restart iscsid.service >/dev/null 2>&1 || :
/bin/systemctl try-restart iscsi.service >/dev/null 1>&1 || :
-%triggerun -- iscsi-initiator-utils < 6.2.0.873-22
-# prior to 6.2.0.873-22 iscsi.service was missing a Wants=remote-fs-pre.target
++%triggerun -- iscsi-initiator-utils < 6.2.0.873-24
++# prior to 6.2.0.873-24 iscsi.service was missing a Wants=remote-fs-pre.target
+ # this forces remote-fs-pre.target active if needed for a clean shutdown/reboot
+ # after upgrading this package
+ if [ $1 -gt 0 ]; then
+ /usr/bin/systemctl -q is-active iscsi.service
+ if [ $? -eq 0 ]; then
+ /usr/bin/systemctl -q is-active remote-fs-pre.target
+ if [ $? -ne 0 ]; then
+ SRC=`/usr/bin/systemctl show --property FragmentPath remote-fs-pre.target | cut -d= -f2`
+ DST=/run/systemd/system/remote-fs-pre.target
+ if [ $SRC != $DST ]; then
+ cp $SRC $DST
+ fi
+ sed -i 's/RefuseManualStart=yes/RefuseManualStart=no/' $DST
+ /usr/bin/systemctl daemon-reload
+ /usr/bin/systemctl start remote-fs-pre.target
+ fi
+ fi
+ fi
+
%files
%doc README
%dir %{_sharedstatedir}/iscsi
@@@ -403,22 -448,47 +449,29 @@@
%{_includedir}/libiscsi.h
%changelog
-* Tue Oct 21 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-23
-- make sure to pass --with-security=no to isns configure (#1088020)
-
-* Wed Sep 24 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-22
-- 1081798 retry login on host not found error
-- 1111925 ignore iscsiadm return in iscsi.service
-- 1126524 make sure systemd order against remote mounts is correct
-- 963039 add discovery as a valid mode in iscsiadm.8
-- sync with upstream
-
-* Tue Mar 18 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-21
-- 1069825
++* Thu Oct 23 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-24.gitc9d830b
++- sync with upstream v2.0.873-84-gc9d830b
++- ignore iscsiadm return in iscsi.service
++- make sure systemd order against remote mounts is correct
++- add discovery as a valid mode in iscsiadm.8
++- make sure to pass --with-security=no to isns configure
++
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2.0.873-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.2.0.873-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Apr 14 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-21
- boot session handling improvements
-- Fix iscsi-mark-root for changed iscsiadm output
-- Make sure iscsiuio is running for boot session recovery when using the
- bnx2i transport by forcing iscsiuio.service start
-- Make NM dispatch triggered re-check for autostart sessions async
-- Accept exit code 21, no records, from iscsiadm as success in
- iscsi.service
-
-* Tue Feb 25 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-20
-- 1049710 host0 being treated as an invalid in the host stats command
-- 1015563 revert change to return code when calling login_portal for sessions
+- split out iscsiuio into a seperate sub-package
+- sync with new upstream additions
+- revert change to return code when calling login_portal for sessions
that already exist, as it impacts users scripting around iscsiadm
-* Mon Feb 17 2014 Chris Leech <cleech at redhat.com> - 6.2.0.873-19
-- 1007388 fixes for iscsiadm to support qla4xxx
-- refresh boot session info patches to final version from upstream,
- fixes context issues with later patches
-- 1006156, 1006161 Add/Update entries in chap table through Open-iSCSI
-- 948134 extend support to set additional parameters for network configuration
-- 1049710 update open-iscsi to support host statistics
-- 1043019 iscsiuio fix for arp cache flush issue
-- 1059332 Fix broken discovery sessions over iser
-- 1017393 split out iscsiuio into a seperate sub-package
-
-* Fri Jan 24 2014 Daniel Mach <dmach at redhat.com> - 6.2.0.873-18
-- Mass rebuild 2014-01-24
-
-* Fri Dec 27 2013 Daniel Mach <dmach at redhat.com> - 6.2.0.873-17
-- Mass rebuild 2013-12-27
+* Tue Dec 10 2013 Chris Leech <cleech at redhat.com> - 6.2.0.873-17
+- fix regression in glob use, inappropriate error code escape
+- clean up dead node links from discovery when reusing tpgt
* Mon Nov 25 2013 Chris Leech <cleech at redhat.com> - 6.2.0.873-16
- fix iscsiuio socket activation
More information about the scm-commits
mailing list