uClibc: fix version check for 0.9.32

[openwrt.git] / package / firewall / files / lib / core.sh

diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh
index 2178e05..c383597 100644 (file)
--- a/package/firewall/files/lib/core.sh
+++ b/package/firewall/files/lib/core.sh
@@ -58,16 +58,14 @@ fw_stop() {
 
        fw_callback pre stop
 
 
        fw_callback pre stop
 

-       local old_zones z
-       config_get old_zones core zones
-       for z in $old_zones; do
-               local old_networks n i
-               config_get old_networks core "${z}_networks"
-               for n in $old_networks; do
+       local z n i
+       config_get z core zones
+       for z in $z; do
+               config_get n core "${z}_networks"
+               for n in $n; do

                        config_get i core "${n}_ifname"
                        [ -n "$i" ] && env -i ACTION=remove ZONE="$z" \
                        config_get i core "${n}_ifname"
                        [ -n "$i" ] && env -i ACTION=remove ZONE="$z" \

-                               INTERFACE="$n" DEVICE="$i" \
-                               /sbin/hotplug-call firewall
+                               INTERFACE="$n" DEVICE="$i" /sbin/hotplug-call firewall

                done
        done
 
                done
        done
 


@@ -109,10 +107,8 @@ fw_die() {
 
 fw_log() {
        local level="$1"
 
 fw_log() {
        local level="$1"

-       [ -n "$2" ] || {
-               shift
-               level=notice
-       }
+       [ -n "$2" ] && shift || level=notice
+       [ "$level" != error ] || echo "Error: $@" >&2

        logger -t firewall -p user.$level "$@"
 }
 
        logger -t firewall -p user.$level "$@"
 }