Fix system boot slow down caused by iscsi script

Revert
commit 8de5a99bad
Author: Mike Christie <michaelc@cs.wisc.edu>
        Fix iscsi NM use

If the network is not up and not coming up then this will
cause multi-minute long boot delays.
This commit is contained in:
Mike Christie 2012-02-14 01:43:34 -06:00
parent 658ff4f3ff
commit 1d09df920d
3 changed files with 7 additions and 3 deletions

View File

@ -5,7 +5,7 @@
* some other maintainer could merge a patch without going through us * some other maintainer could merge a patch without going through us
*/ */
-#define ISCSI_VERSION_STR "2.0-872" -#define ISCSI_VERSION_STR "2.0-872"
+#define ISCSI_VERSION_STR "2.0-872.17.f17" +#define ISCSI_VERSION_STR "2.0-872.18.f17"
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version" #define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
#endif #endif

View File

@ -3,7 +3,7 @@
Summary: iSCSI daemon and utility programs Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils Name: iscsi-initiator-utils
Version: 6.2.0.872 Version: 6.2.0.872
Release: 17%{?dist} Release: 18%{?dist}
Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz
Source1: iscsid.init Source1: iscsid.init
Source2: iscsidevs.init Source2: iscsidevs.init
@ -229,6 +229,10 @@ fi
%{_includedir}/libiscsi.h %{_includedir}/libiscsi.h
%changelog %changelog
* Mon Feb 14 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.18
- 789683 Fix boot slow down when the iscsi service is started
(regression added in 6.2.0.872.16 when the nm wait was added).
* Mon Feb 5 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.17 * Mon Feb 5 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.17
- 786174 Change iscsid/iscsi service startup, so it always starts - 786174 Change iscsid/iscsi service startup, so it always starts
when called. when called.

View File

@ -34,7 +34,7 @@ start() {
# if the network isn't up yet exit cleanly, NetworkManager will call us # if the network isn't up yet exit cleanly, NetworkManager will call us
# again when the network is up # again when the network is up
[ ! -f /var/lock/subsys/network ] && ! nm-online -t 60 >/dev/null 2>&1 && exit 3 [ ! -f /var/lock/subsys/network ] && ! nm-online -x >/dev/null 2>&1 && exit 3
# this script is normally called from startup so log into # this script is normally called from startup so log into
# nodes marked node.startup=automatic # nodes marked node.startup=automatic