diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index eff9f74..62c6515 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: 9%{?dist} +Release: 10%{?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 @@ -176,6 +176,9 @@ fi %{_includedir}/libiscsi.h %changelog +* Mon Apr 25 2010 Mike Christie 6.2.0.872.10 +- Fix iscsi init scripts check for networking being up. + * Wed Feb 09 2011 Fedora Release Engineering - 6.2.0.872-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/iscsidevs.init b/iscsidevs.init index 731755a..ef25a61 100755 --- a/iscsidevs.init +++ b/iscsidevs.init @@ -39,7 +39,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 -a ! -f /var/lock/subsys/NetworkManager ] && exit 0 + [ ! -f /var/lock/subsys/network ] && ! status NetworkManager >/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