diff --git a/miniupnpd/linux/miniupnpd.init.d.script b/miniupnpd/linux/miniupnpd.init.d.script index a8e2b85..be0ea8b 100644 --- a/miniupnpd/linux/miniupnpd.init.d.script +++ b/miniupnpd/linux/miniupnpd.init.d.script @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: miniupnpd.init.d.script,v 1.4 2022/02/19 22:45:06 nanard Exp $ +# $Id: miniupnpd.init.d.script,v 1.5 2023/01/21 12:08:40 nanard Exp $ # MiniUPnP project # author: Thomas Bernard # website: http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ @@ -22,6 +22,9 @@ ARGS="-f $ETCPATH/miniupnpd.conf" if [ -f $ETCPATH/nft_init.sh ] ; then IPTABLES_CREATE=$ETCPATH/nft_init.sh IPTABLES_REMOVE=$ETCPATH/nft_removeall.sh +elif [ -f $ETCPATH/ip6tables_init.sh ] ; then +IPTABLES_CREATE="($ETCPATH/iptables_init.sh ; $ETCPATH/ip6tables_init.sh)" +IPTABLES_REMOVE="($ETCPATH/iptables_removeall.sh ; $ETCPATH/iptables_removeall.sh)" else IPTABLES_CREATE=$ETCPATH/iptables_init.sh IPTABLES_REMOVE=$ETCPATH/iptables_removeall.sh @@ -34,7 +37,7 @@ test -f $MINIUPNPD || exit 0 case "$1" in start) log_daemon_msg "Starting miniupnpd" "miniupnpd" - $IPTABLES_CREATE > /dev/null 2>&1 + eval $IPTABLES_CREATE > /dev/null 2>&1 start-stop-daemon --start --quiet --pidfile /var/run/miniupnpd.pid --startas $MINIUPNPD -- $ARGS $LSBNAMES log_end_msg $? ;; @@ -42,13 +45,13 @@ case "$1" in log_daemon_msg "Stopping miniupnpd" "miniupnpd" start-stop-daemon --stop --quiet --pidfile /var/run/miniupnpd.pid log_end_msg $? - $IPTABLES_REMOVE > /dev/null 2>&1 + eval $IPTABLES_REMOVE > /dev/null 2>&1 ;; restart|reload|force-reload) log_daemon_msg "Restarting miniupnpd" "miniupnpd" start-stop-daemon --stop --retry 5 --quiet --pidfile /var/run/miniupnpd.pid - $IPTABLES_REMOVE > /dev/null 2>&1 - $IPTABLES_CREATE > /dev/null 2>&1 + eval $IPTABLES_REMOVE > /dev/null 2>&1 + eval $IPTABLES_CREATE > /dev/null 2>&1 start-stop-daemon --start --quiet --pidfile /var/run/miniupnpd.pid --startas $MINIUPNPD -- $ARGS $LSBNAMES log_end_msg $? ;;