- formatting

[packages/frox.git] / frox.init

diff --git a/frox.init b/frox.init
index 59666b58cbff99ad6e723f042dc3272b15df7176..102f0f7206f4c7eeb4e3d276b0646396d0e5815a 100644 (file)
--- a/frox.init
+++ b/frox.init
@@ -11,56 +11,60 @@
 # Configuration file.
 . /etc/sysconfig/frox
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-        if [ ! -f /var/lock/subsys/frox ]; then
+       if [ ! -f /var/lock/subsys/frox ]; then
+               if [ ! "$IPCHAINS_RULE" ] && [ ! "$IPTABLES_RULE" ]; then
+                       echo $(nls "Please edit /etc/sysconfig/frox")' !'
+                       exit 6
+               fi
                msg_starting frox
                daemon frox -f /etc/frox.conf
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/frox
-               if [ -x /usr/sbin/iptables -a -n "$IPTABLES_RULE" ] ; then
-                       action "Redirecting FTP traffic" /usr/sbin/iptables -A $IPTABLES_RULE
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/frox
+               if [ -x /usr/sbin/iptables -a -n "$IPTABLES_RULE" ]; then
+                       run_cmd "Redirecting FTP traffic" '/usr/sbin/iptables -t nat -A $IPTABLES_RULE'
                fi
-               if [ -x /sbin/ipchains -a -n "$IPCHAINS_RULE" ] ; then
-                       action "Redirecting FTP traffic" /sbin/ipchains -A $IPCHAINS_RULE
+               if [ -x /sbin/ipchains -a -n "$IPCHAINS_RULE" ]; then
+                       run_cmd "Redirecting FTP traffic" '/sbin/ipchains -A $IPCHAINS_RULE'
                fi
+
        else
-               msg_Already_Running frox
-               exit 1
+               msg_already_running frox
        fi
        ;;
   stop)
-        # Stop daemons.
+       # Stop daemons.
        if [ -f /var/lock/subsys/frox ]; then
-               if [ -x /usr/sbin/iptables -a -n "$IPTABLES_RULE" ] ; then
-                       action "Removing FTP traffic redirection" /usr/sbin/iptables -D $IPTABLES_RULE
+               if [ -x /usr/sbin/iptables -a -n "$IPTABLES_RULE" ]; then
+                       run_cmd "Removing FTP traffic redirection" '/usr/sbin/iptables -D $IPTABLES_RULE'
                fi
-               if [ -x /sbin/ipchains -a -n "$IPCHAINS_RULE" ] ; then
-                       action "Removing FTP traffic redirection" /sbin/ipchains -D $IPCHAINS_RULE
+               if [ -x /sbin/ipchains -a -n "$IPCHAINS_RULE" ]; then
+                       run_cmd "Removing FTP traffic redirection" '/sbin/ipchains -D $IPCHAINS_RULE'
                fi
-                msg_stopping frox
-                killproc frox
-                rm -f /var/lock/subsys/frox /var/run/frox.pid >/dev/null 2>&1
-        else
-               msg_Not_Running frox
-               exit 1
+               msg_stopping frox
+               killproc frox
+               rm -f /var/lock/subsys/frox /var/run/frox.pid >/dev/null 2>&1
+       else
+               msg_not_running frox
        fi
        ;;
   status)
        status frox
        exit $?
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   *)
-       msg_Usage "$0 {start|stop|restart|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
        ;;
 esac
 
 exit $RETVAL
-