From 13d7f9dd9384176231652ceec5afe8906f892ff2 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Feb 14 2012 22:29:58 +0000
Subject: Fix system boot slow down caused by iscsi script


Revert
commit 8de5a99bad437800da9433fb6bd60b9548cb2994
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.

---

diff --git a/iscsi-initiator-utils-add-rh-ver.patch b/iscsi-initiator-utils-add-rh-ver.patch
index 18c1b64..6bdf7fe 100644
--- a/iscsi-initiator-utils-add-rh-ver.patch
+++ b/iscsi-initiator-utils-add-rh-ver.patch
@@ -5,7 +5,7 @@
   * 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.17.f17"
++#define ISCSI_VERSION_STR	"2.0-872.18.f17"
  #define ISCSI_VERSION_FILE	"/sys/module/scsi_transport_iscsi/version"
  
  #endif
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index dcbdeda..da100f6 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 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
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -229,6 +229,10 @@ fi
 %{_includedir}/libiscsi.h
 
 %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
 - 786174 Change iscsid/iscsi service startup, so it always starts
   when called.
diff --git a/iscsidevs.init b/iscsidevs.init
index 833fc35..60498c4 100755
--- a/iscsidevs.init
+++ b/iscsidevs.init
@@ -34,7 +34,7 @@ start() {
 
     # if the network isn't up yet exit cleanly, NetworkManager will call us
     # 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
     # nodes marked node.startup=automatic