[iscsi-initiator-utils] Change iscsi init scripts to check for networking being actually up, rather then for NetworkManager

[Hans de Goede]

commit f149ee29a92bf98cd94558124ed95a62e50c8925
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Apr 30 10:29:31 2011 +0200

    Change iscsi init scripts to check for networking being actually up, rather
    then for NetworkManager being started (#692230)

 iscsi-initiator-utils.spec |    6 +++++-
 iscsidevs.init             |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index a2292c8..c77063a 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: 11%{?dist}
+Release: 12%{?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
@@ -187,6 +187,10 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
+* Sat Apr 30 2011 Hans de Goede <hdegoede at redhat.com> - 6.2.0.872-12
+- Change iscsi init scripts to check for networking being actually up, rather
+  then for NetworkManager being started (#692230)
+
 * Tue Apr 26 2011 Hans de Goede <hdegoede at redhat.com> - 6.2.0.872-11
 - Fix iscsid autostarting when upgrading from an older version
   (add iscsid.startup key to iscsid.conf on upgrade)
diff --git a/iscsidevs.init b/iscsidevs.init
index ba84a87..5ff8a6d 100755
--- a/iscsidevs.init
+++ b/iscsidevs.init
@@ -41,7 +41,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 ] && ! status NetworkManager >/dev/null 2>&1 && exit 0
+    [ ! -f /var/lock/subsys/network ] && ! nm-online -x >/dev/null 2>&1 && exit 0
 
     # if no nodes are setup to startup automatically exit cleanly
     grep -qrs "node.startup = automatic" /var/lib/iscsi/nodes