firewall: fix fallout from r18716 (fixes #6338)

SVN-Revision: 18733
This commit is contained in:
Felix Fietkau 2009-12-10 18:18:37 +00:00
parent ae89e435d9
commit 10f627db5c

View File

@ -417,7 +417,8 @@ get_interface_zones() {
fw_event() { fw_event() {
local action="$1" local action="$1"
local interface="$2" local interface="$2"
local ifname="$(sh -c ". /etc/functions.sh; config_load network; config_get "$interface" ifname")" local ifname="$(sh -c ". /etc/functions.sh; include /lib/network; scan_interfaces; config_get "$interface" ifname")"
add_zone=
local up local up
[ -z "$ifname" ] && return 0 [ -z "$ifname" ] && return 0
@ -503,6 +504,7 @@ fw_init() {
echo "Loading zone defaults" echo "Loading zone defaults"
config_foreach fw_zone_defaults zone config_foreach fw_zone_defaults zone
uci_set_state firewall core loaded 1 uci_set_state firewall core loaded 1
config_set core loaded 1
config_foreach fw_check_notrack zone 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; config_foreach echo interface')"
for interface in $INTERFACES; do for interface in $INTERFACES; do