From fa11019822ae97b23fdc341aaaf0f27583e77c37 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 17 May 2010 12:47:14 +0000
Subject: [package] firewall: 	- defer firewall start until the first
 interface is brought up by hotplug, fixes race conditions on slow devices 
 - create a file lock during firewall start and wait for it in hotplug events,
 prevents race conditions between start and addif 	- start firewall
 actions in background from hotplug handler since the firewall itself fires
 further hotplug events which results in a deadlock if not forked off 	- get
 loaded state direcly from the uci binary since updated value is not
 recognized by config_get after uci_set_state 	- bump package revision to r2

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21486 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/firewall/files/lib/core.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'package/firewall/files/lib')

diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh
index 3fd98d1602..bf44231fb0 100644
--- a/package/firewall/files/lib/core.sh
+++ b/package/firewall/files/lib/core.sh
@@ -8,6 +8,8 @@ include /lib/network
 fw_start() {
 	fw_init
 
+	lock /var/lock/firewall.start
+
 	FW_DEFAULTS_APPLIED=
 
 	fw_is_loaded && {
@@ -49,6 +51,8 @@ fw_start() {
 	fw_callback post core
 
 	uci_set_state firewall core loaded 1
+
+	lock -u /var/lock/firewall.start
 }
 
 fw_stop() {
@@ -75,9 +79,8 @@ fw_reload() {
 }
 
 fw_is_loaded() {
-	local bool
-	config_get_bool bool core loaded 0
-	return $((! $bool))
+	local bool=$(uci -q -P /var/state get firewall.core.loaded)
+	return $((! ${bool:-0}))
 }
 
 
-- 
cgit v1.2.3