- add upstream patch to fix building with linux 4.7

[packages/ipset.git] / ipset.init

diff --git a/ipset.init b/ipset.init
old mode 100644 (file)
new mode 100755 (executable)
index 98ca9e3..b4ba635
--- a/ipset.init
+++ b/ipset.init
@@ -1,13 +1,15 @@
 #!/bin/sh
-
+#
 # chkconfig: 2345 07 93
 # description: Automates administration of IP sets.
+#
 # config: /etc/sysconfig/ipset
+#
 
 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
@@ -16,19 +18,52 @@ fi
 . /etc/rc.d/init.d/functions
 
 start() {
-       if [ -f $IPSET_CONFIG ]; then
-               show "Applying ipset rules"
-               /usr/sbin/ipset -R $IPSET_CONFIG && ok || fail
-               touch /var/lock/subsys/ipset
+       if [ ! -f $IPSET_CONFIG ]; then
+               return
+       fi
+
+       show "Applying ipset rules"
+       /usr/sbin/ipset -X
+       /usr/sbin/ipset -R < $IPSET_CONFIG
+       RETVAL=$?
+       if [ $RETVAL = 0 ]; then
+               ok
+       else
+               fail
        fi
+       touch /var/lock/subsys/ipset
 }
 
 stop() {
+       if [ ! -f /var/lock/subsys/ipset ]; then
+               return
+       fi
+
        show "Resetting ipset rules"
        /usr/sbin/ipset -X && ok || fail
        rm -f /var/lock/subsys/ipset
 }
 
+save() {
+       show "Saving current rules to %s" $IPSET_CONFIG
+       /usr/sbin/ipset -S > $IPSET_CONFIG.tmp
+       RETVAL=$?
+       if [ $RETVAL = 0 ]; then
+               cat $IPSET_CONFIG.tmp > $IPSET_CONFIG
+               chmod 600 $IPSET_CONFIG
+               ok
+       else
+               fail
+       fi
+       rm -f $IPSET_CONFIG.tmp
+}
+
+status() {
+       /usr/sbin/ipset list
+       RETVAL=$?
+}
+
+RETVAL=0
 case "$1" in
   start)
        start
@@ -36,21 +71,18 @@ case "$1" in
   stop)
        stop
        ;;
-  restart|force-reload)
+  restart|try-restart|reload|force-reload)
        start
        ;;
-  status)
-       /usr/sbin/ipset -L --sorted --numeric
-       ;;
   save)
-       show "Saving current rules to %s" $IPSET_CONFIG
-       touch $IPSET_CONFIG
-       chmod 600 $IPSET_CONFIG
-       /usr/sbin/ipset -S > $IPSET_CONFIG  2>/dev/null && ok || fail
+       save
+       ;;
+  status)
+       status
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status|save}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|save|status}"
        exit 3
 esac
 
-exit 0
+exit $RETVAL