mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Fix macvlan interface support and add interface in wizard using device

Browse source
This commit is contained in:
Ycarus 2018-09-01 21:59:02 +02:00
parent 2f13420592
commit 2153472351
5 changed files with 70 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
View file

@ -306,7 +306,7 @@ if not net:is_virtual() then
-- macsource.rmempty = true
end
macvlanmaster = s:taboption("physical", Value, "interface", translate("Master interface"))
macvlanmaster = s:taboption("physical", Value, "masterintf", translate("Master interface"))
macvlanmaster.default = "eth0"
macvlanmaster:depends("type", "macvlan")

9
luci-mod-admin-full/root/etc/init.d/macvlan
View file

@ -33,11 +33,11 @@ _setup_interface() {
uci -q get "network.$1_dev.ifname" >/dev/null && {
uci -q set network.$1_dev.mtu=$(uci -q get network.$1.mtu)
uci -q commit network
[ -n "$(uci -q get network.$1.masterintf)" ] && uci -q set network.$1_dev.ifname=$(uci -q get network.$1.masterintf)
[ -z "$(uci -q get network.$1.masterintf)" ] && uci -q set network.$1.masterintf=$(uci -q get network.$1_dev.ifname)
[ "$_type" = "macvlan" ] || {
uci -q batch <<-EOF
delete network.$1_dev
commit network
EOF
}
[ "$_type" = "macvlan" ] && {
@ -47,10 +47,10 @@ _setup_interface() {
uci -q batch <<-EOF
delete network.$1.interface
set network.$1_dev.ifname=$_interface
commit network
EOF
}
}
uci -q commit network
return 0
}
@ -62,12 +62,13 @@ _setup_interface() {
set network.$1_dev.type=macvlan
set network.$1_dev.ifname=$_ifname
set network.$1.ifname=$1
set network.$1.masterintf=$_ifname
set network.$1.type=macvlan
set network.$1.defaultroute=0
EOF
_macaddr=$(uci -q get "network.$1.macaddr")
_setup_macaddr "$1" "${_macaddr:-auto$(date +%s)}"
uci -q set "network.$1.type=macvlan" # legacy
uci -q set network.$1_dev.mtu=$(uci -q get network.$1.mtu)
uci -q commit network
}