- at least 2.6.24 headers are required according to configure

[packages/ipset.git] / ipset.init

diff --git a/ipset.init b/ipset.init
old mode 100644 (file)
new mode 100755 (executable)
index 7389f78..b4ba635
--- a/ipset.init
+++ b/ipset.init
@@ -5,12 +5,11 @@
 #
 # config: /etc/sysconfig/ipset
 #
-# $Id$
 
 IPSET_CONFIG=/etc/sysconfig/ipset
 if [ ! -f $IPSET_CONFIG ]; then
        case "$1" in
-       start|restart|force-reload)
+       start|restart|try-restart|reload|force-reload)
                exit 0
        ;;
        esac
@@ -45,16 +44,6 @@ stop() {
        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
@@ -70,7 +59,7 @@ save() {
 }
 
 status() {
-       /usr/sbin/ipset -L --sorted --numeric
+       /usr/sbin/ipset list
        RETVAL=$?
 }
 
@@ -82,12 +71,9 @@ case "$1" in
   stop)
        stop
        ;;
-  restart|reload|force-reload)
+  restart|try-restart|reload|force-reload)
        start
        ;;
-  try-restart)
-       condrestart 0
-       ;;
   save)
        save
        ;;