From fb604946cd549141e7b4e7731a7864fe8bd80c1d Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 14 Sep 2009 16:54:57 +0000
Subject: [PATCH] [8.09] merge r17580, r17581 and r17582

SVN-Revision: 17583
---
 package/base-files/Makefile          | 2 +-
 package/base-files/files/sbin/ifdown | 4 ++--
 package/firewall/Makefile            | 2 +-
 package/firewall/files/20-firewall   | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ccdf9c5762..f46fe74509 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=14.6
+PKG_RELEASE:=14.7
 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown
index 883f8ec428..8de414d8b6 100755
--- a/package/base-files/files/sbin/ifdown
+++ b/package/base-files/files/sbin/ifdown
@@ -22,8 +22,8 @@ config_get proto "$cfg" proto
 [ -z "$proto" ] && { echo "interface not found."; exit; }
 
 config_get iface "$cfg" device
-[ "static" = "$proto" ] && {
-	env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" &
+[ "static" = "$proto" -o "none" = "$proto" ] && {
+	env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$iface" PROTO="$proto" /sbin/hotplug-call "iface"
 }
 
 # call interface stop handler
diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 20bda1a475..6326fe4266 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=1
-PKG_RELEASE:=1.2
+PKG_RELEASE:=1.3
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/20-firewall b/package/firewall/files/20-firewall
index 38fbb94418..1cfc1b9c0e 100644
--- a/package/firewall/files/20-firewall
+++ b/package/firewall/files/20-firewall
@@ -27,9 +27,10 @@ config_foreach load_zones zone
 }
 
 [ ifdown = "$ACTION" ] && {
+	local up
+	config_get up "$INTERFACE" up
+
 	for z in $ZONE; do 
-		local up
-		config_get up $z up
 		[ "$up" == "1" ] && delif "$INTERFACE" "$ifname" "$z"
 	done
 }
-- 
2.30.2