From f7476239ad245051e76b396d53561d99f269aae6 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 11 May 2020 09:57:25 +0200 Subject: [PATCH] Fix macvlan creation --- luci-app-macvlan/root/etc/init.d/macvlan | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/luci-app-macvlan/root/etc/init.d/macvlan b/luci-app-macvlan/root/etc/init.d/macvlan index eb51d3808..b82725472 100755 --- a/luci-app-macvlan/root/etc/init.d/macvlan +++ b/luci-app-macvlan/root/etc/init.d/macvlan @@ -46,11 +46,22 @@ _create_interface() { _ifname=$1 } config_get _masterifname "$1" ifname + [ "$1" != "$_ifname" ] && { + uci batch <<-EOF + delete macvlan.$1 + set macvlan.$_ifname=macvlan + set macvlan.$_ifname.name=$_ifname + set macvlan.$_ifname.ifname=$_masterifname + commit macvlan + EOF + } + logger -t "MACVLAN" "Create interface $_ifname based on $_masterifname" uci batch <<-EOF set network.$_ifname=interface set network.$_ifname.type=macvlan set network.$_ifname.proto=static set network.$_ifname.masterintf=$_masterifname + commit network EOF } @@ -67,6 +78,7 @@ _setup_interface() { config_get _type "$1" type [ "$_type" = "macvlan" ] && [ "$(uci -q get macvlan.$1)" = "" ] && { + logger -t "MACVLAN" "Delete $1" uci -q batch <<-EOF delete network.$1 delete network.$1_dev