firewall: run ifdown hotplug events synchronized, fixes a racecondition on "ifup...

SVN-Revision: 23064

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 205f2098cb445c5151ddefc5113da5094619a921..8cf22e8348920cc5cbacbc8cbfd6df5213925c8e 100644 (file)
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=14
+PKG_RELEASE:=15
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/firewall/files/firewall.hotplug b/package/firewall/files/firewall.hotplug
index ac8469524b290fd7ce5a45d276ae59dc353f3f49..720b34cc89155b32ddfe6820f3a1c67dfeb73d0c 100644 (file)
--- a/package/firewall/files/firewall.hotplug
+++ b/package/firewall/files/firewall.hotplug
@@ -17,6 +17,6 @@ case "$ACTION" in
                fw_configure_interface "$INTERFACE" add "$DEVICE" &
        ;;
        ifdown)
-               fw_configure_interface "$INTERFACE" del "$DEVICE" &
+               fw_configure_interface "$INTERFACE" del "$DEVICE"
        ;;
 esac

diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh
index 2178e0505c81267909a879c43f529b9cdd2fe3e7..c350e8f0f61b76931d542235c2ca415285387563 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
 
-       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" \
-                               INTERFACE="$n" DEVICE="$i" \
-                               /sbin/hotplug-call firewall
+                               INTERFACE="$n" DEVICE="$i" /sbin/hotplug-call firewall
                done
        done