rpms/iscsi-initiator-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Change iscsi init scripts to check for networking being actually up, rather

Browse Source 
then for NetworkManager being started (#692230)
This commit is contained in:
Hans de Goede 2011-04-30 10:29:31 +02:00
parent ed7c748574
commit f149ee29a9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
iscsi-initiator-utils.spec
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: 11%{?dist} Release: 12%{?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
@ -187,6 +187,10 @@ fi
%{_includedir}/libiscsi.h %{_includedir}/libiscsi.h
%changelog %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 * Tue Apr 26 2011 Hans de Goede <hdegoede@redhat.com> - 6.2.0.872-11
- Fix iscsid autostarting when upgrading from an older version - Fix iscsid autostarting when upgrading from an older version
(add iscsid.startup key to iscsid.conf on upgrade) (add iscsid.startup key to iscsid.conf on upgrade)

2
iscsidevs.init
View File

@ -41,7 +41,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 ] && ! 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 # if no nodes are setup to startup automatically exit cleanly
grep -qrs "node.startup = automatic" /var/lib/iscsi/nodes grep -qrs "node.startup = automatic" /var/lib/iscsi/nodes