From b41dbda12e2e0d8b936ea9237e4ca095da85254d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Tue, 11 Dec 2007 09:47:20 +0000
Subject: [PATCH] - use $RETVAL for exit status. NOTE: stop should never fail

Changed files:
    ipset.init -> 1.3
---
 ipset.init | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/ipset.init b/ipset.init
index d4a05fa..2fe2342 100644
--- a/ipset.init
+++ b/ipset.init
@@ -19,7 +19,13 @@ start() {
 	if [ -f $IPSET_CONFIG ]; then
 		show "Applying ipset rules"
 		/usr/sbin/ipset -X
-		/usr/sbin/ipset -R < $IPSET_CONFIG && ok || fail
+		/usr/sbin/ipset -R < $IPSET_CONFIG
+	   	RETVAL=$?
+		if [ $RETVAL = 0 ]; then
+			ok
+		else
+			fail
+		fi
 		touch /var/lock/subsys/ipset
 	fi
 }
@@ -30,18 +36,16 @@ stop() {
 	rm -f /var/lock/subsys/ipset
 }
 
+RETVAL=0
 case "$1" in
   start)
 	start
-	exit $?
 	;;
   stop)
 	stop
-	exit $?
 	;;
   restart|force-reload)
 	start
-	exit $?
 	;;
   status)
 	/usr/sbin/ipset -L --sorted --numeric
@@ -51,10 +55,17 @@ case "$1" in
 	show "Saving current rules to %s" $IPSET_CONFIG
 	touch $IPSET_CONFIG
 	chmod 600 $IPSET_CONFIG
-	/usr/sbin/ipset -S > $IPSET_CONFIG && ok || fail
-	exit $?
+	/usr/sbin/ipset -S > $IPSET_CONFIG
+   	RETVAL=$?
+	if [ $RETVAL = 0 ]; then
+		ok
+	else
+		fail
+	fi
 	;;
   *)
 	msg_usage "$0 {start|stop|restart|force-reload|status|save}"
 	exit 3
 esac
+
+exit $RETVAL
-- 
2.44.0