From 6eae630652590195591785a848fd239714a0dfe5 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 19 Jan 2010 23:02:11 +0000 Subject: [PATCH] firewall: fix a race condition preventing interfaces from being added to the firewall on boot SVN-Revision: 19232 --- package/firewall/Makefile | 2 +- package/firewall/files/uci_firewall.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/firewall/Makefile b/package/firewall/Makefile index 8d0452602b..abc6020434 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:=9 +PKG_RELEASE:=10 include $(INCLUDE_DIR)/package.mk diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh index 05fe39beb0..49e5ca8595 100755 --- a/package/firewall/files/uci_firewall.sh +++ b/package/firewall/files/uci_firewall.sh @@ -506,9 +506,13 @@ fw_init() { uci_set_state firewall core loaded 1 config_set core loaded 1 config_foreach fw_check_notrack zone - INTERFACES="$(sh -c '. /etc/functions.sh; config_load network; config_foreach echo interface')" + INTERFACES="$(sh -c ' + . /etc/functions.sh; config_load network + echo_up() { local up; config_get_bool up "$1" up 0; [ $up = 1 ] && echo "$1"; } + config_foreach echo_up interface + ')" for interface in $INTERFACES; do - fw_addif "$interface" + fw_event ifup "$interface" done }