packages: ipset/ipset.init - condrestart 0 handled same way by plain start

[glen]

Author: glen                         Date: Wed Jul 21 05:26:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- condrestart 0 handled same way by plain start

---- Files affected:
packages/ipset:
   ipset.init (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/ipset/ipset.init
diff -u packages/ipset/ipset.init:1.4 packages/ipset/ipset.init:1.5
--- packages/ipset/ipset.init:1.4	Wed Jul 21 07:25:02 2010
+++ packages/ipset/ipset.init	Wed Jul 21 07:26:04 2010
@@ -45,16 +45,6 @@
 	rm -f /var/lock/subsys/ipset
 }
 
-condrestart() {
-	if [ ! -f /var/lock/subsys/ipset ]; then
-		RETVAL=$1
-		return
-	fi
-
-	stop
-	start
-}
-
 save() {
 	show "Saving current rules to %s" $IPSET_CONFIG
 	/usr/sbin/ipset -S > $IPSET_CONFIG.tmp
@@ -82,11 +72,8 @@
   stop)
 	stop
 	;;
-  restart|reload|force-reload)
+  restart|try-restart|reload|force-reload)
 	start
-	;;
-  try-restart)
-	condrestart 0
 	;;
   save)
 	save
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipset/ipset.init?r1=1.4&r2=1.5&f=u