From f3b64b4eda6b93208ff2f3e0224d4170b8310590 Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Thu, 22 Sep 2011 13:56:02 +0000 Subject: [PATCH] luci-0.10: Merge r7521 --- .../files/etc/hotplug.d/firewall/24-policyrouting | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/firewall/24-policyrouting b/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/firewall/24-policyrouting index 3e6f8155c..014803a7d 100644 --- a/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/firewall/24-policyrouting +++ b/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/firewall/24-policyrouting @@ -46,7 +46,11 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then if [ "`uci -q get network.$int.type`" == "bridge" ]; then dev="br-$int" else - dev=`uci get network.$int.ifname` + if [ -n "`uci -p /var/state get network.$int.ifname`" ]; then + dev=`uci -p /var/state get network.$int.ifname` + else + dev=`uci -p /var/state get network.$int.device` + fi fi logger -t policyrouting "Add mark 1 to packages coming in via interface $dev" iptables -t mangle -I prerouting_policy -i $dev -j MARK --set-mark 1 -- 2.25.1