From 7a4e711fcd005c44161f9f38d2d6cab9365c82fa Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 3 Apr 2009 07:29:43 +0000 Subject: [PATCH] - Stop the NM script from exiting with an error status when it didn't do anything (#493411) --- 04-iscsi | 14 ++++++++------ iscsi-initiator-utils.spec | 6 +++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/04-iscsi b/04-iscsi index b85c1eb..58aa798 100755 --- a/04-iscsi +++ b/04-iscsi @@ -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 diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 9dc5372..bbc4f9d 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.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 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 6.2.0.870-7 - libiscsi: use fwparam_ibft_sysfs() instead of fw_get_entry(), as the latter causes stack corruption (workaround #490515)