- Stop the NM script from exiting with an error status when it didn't do

anything (#493411)
This commit is contained in:
Hans de Goede 2009-04-03 07:29:43 +00:00
parent cd44d1200d
commit 7a4e711fcd
2 changed files with 13 additions and 7 deletions

View File

@ -3,13 +3,15 @@
export LC_ALL=C
if [ "$2" = "down" ]; then
/sbin/ip route ls | grep -q ^default || {
[ -f /var/lock/subsys/iscsi ] && /etc/rc.d/init.d/iscsi stop
}
if ! /sbin/ip route ls | grep -q ^default &&
[ -f /var/lock/subsys/iscsi ]; then
/etc/rc.d/init.d/iscsi stop
fi
fi
if [ "$2" = "up" ]; then
/sbin/ip -o route show dev "$1" | grep -q '^default' && {
/sbin/chkconfig iscsi && /etc/rc.d/init.d/iscsi start
}
if /sbin/ip -o route show dev "$1" | grep -q '^default' &&
/sbin/chkconfig iscsi; then
/etc/rc.d/init.d/iscsi start
fi
fi

View File

@ -3,7 +3,7 @@
Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils
Version: 6.2.0.870
Release: 7%{?dist}
Release: 8%{?dist}
Source0: http://www.open-iscsi.org/bits/open-iscsi-2.0-870.1.tar.gz
Source1: iscsid.init
Source2: iscsidevs.init
@ -162,6 +162,10 @@ fi
%{_includedir}/libiscsi.h
%changelog
* Fri Apr 3 2009 Hans de Goede <hdegoede@redhat.com> 6.2.0.870-8
- Stop the NM script from exiting with an error status when it
didn't do anything (#493411)
* Fri Mar 20 2009 Hans de Goede <hdegoede@redhat.com> 6.2.0.870-7
- libiscsi: use fwparam_ibft_sysfs() instead of fw_get_entry(), as
the latter causes stack corruption (workaround #490515)