X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5acb7ec58a5220ac99bbc6ca274bc698191fff49..603d01fbba5d16467af24fa6c1d5902920d36dbb:/package/firewall/files/firewall.hotplug

diff --git a/package/firewall/files/firewall.hotplug b/package/firewall/files/firewall.hotplug
index bc75e42d1..720b34cc8 100644
--- a/package/firewall/files/firewall.hotplug
+++ b/package/firewall/files/firewall.hotplug
@@ -3,26 +3,20 @@
 # HOTPLUG_TYPE=iface, triggered by various scripts when an interface
 # is configured (ACTION=ifup) or deconfigured (ACTION=ifdown).  The
 # interface is available as INTERFACE, the real device as DEVICE.
-. /etc/functions.sh
 
 [ "$DEVICE" == "lo" ] && exit 0
 
+. /etc/functions.sh
 . /lib/firewall/core.sh
-fw_init
 
-# Wait for firewall if startup is in progress
-lock -w /var/lock/firewall.start
+fw_init
+fw_is_loaded || exit 0
 
 case "$ACTION" in
 	ifup)
-		fw_is_loaded && {
-			fw_configure_interface "$INTERFACE" add "$DEVICE" &
-		} || {
-			/etc/init.d/firewall enabled && fw_start &
-		}
+		fw_configure_interface "$INTERFACE" add "$DEVICE" &
 	;;
 	ifdown)
-		fw_is_loaded && fw_configure_interface "$INTERFACE" del "$DEVICE" &
+		fw_configure_interface "$INTERFACE" del "$DEVICE"
 	;;
 esac
-