Change iscsi init scripts to check for networking being actually up, rather
then for NetworkManager being started (#692230)
This commit is contained in:
parent
ed7c748574
commit
f149ee29a9
@ -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@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@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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user