From 72f995d0699274539a21380fec701ccd08b86ed6 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Wed, 25 Apr 2018 18:15:08 +0200 Subject: [PATCH] Fix when wan on anything else than eth0 --- luci-mod-admin-full/root/etc/init.d/macvlan | 2 +- openmptcprouter/files/etc/uci-defaults/1920-omr-network | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/luci-mod-admin-full/root/etc/init.d/macvlan b/luci-mod-admin-full/root/etc/init.d/macvlan index ef7a1277d..56b9f6848 100755 --- a/luci-mod-admin-full/root/etc/init.d/macvlan +++ b/luci-mod-admin-full/root/etc/init.d/macvlan @@ -36,7 +36,7 @@ _setup_interface() { set network.$1_dev=device set network.$1_dev.name=$1 set network.$1_dev.type=macvlan - set network.$1_dev.ifname=eth0 + set network.$1_dev.ifname=$_ifname set network.$1.ifname=$1 set network.$1.defaultroute=0 EOF diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network index edfedd51d..e65b96f7e 100755 --- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network +++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network @@ -21,7 +21,7 @@ _setup_macvlan() { set network.$1_dev=device set network.$1_dev.name=$1 set network.$1_dev.type=macvlan - set network.$1_dev.ifname=eth0 + set network.$1_dev.ifname=$_ifname set network.$1.ifname=$1 EOF _macaddr=$(uci -q get "network.$1.macaddr") @@ -112,8 +112,6 @@ if [ "$(uci -q show network | grep wan)" = "" ]; then set network.@route6[-1].target='::/0' commit network EOF - _setup_macvlan wan1 - _setup_macvlan wan2 rm -f /tmp/luci-indexcache fi exit 0