rpms/iscsi-initiator-utils/devel 04-iscsi, 1.1, 1.2 iscsi-initiator-utils.spec, 1.42, 1.43

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22194

Modified Files:
	04-iscsi iscsi-initiator-utils.spec 
Log Message:
* Fri Apr  3 2009 Hans de Goede <hdegoede at redhat.com> 6.2.0.870-8
- Stop the NM script from exiting with an error status when it
  didn't do anything (#493411)



Index: 04-iscsi
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/04-iscsi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 04-iscsi	13 Oct 2008 18:12:29 -0000	1.1
+++ 04-iscsi	3 Apr 2009 07:29:43 -0000	1.2
@@ -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


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- iscsi-initiator-utils.spec	20 Mar 2009 14:24:54 -0000	1.42
+++ iscsi-initiator-utils.spec	3 Apr 2009 07:29:43 -0000	1.43
@@ -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 @@
 %{_includedir}/libiscsi.h
 
 %changelog
+* Fri Apr  3 2009 Hans de Goede <hdegoede at 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 at 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)