nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-core: fixup passing ipaddr from wired

Browse Source
This commit is contained in:
Maciej Krüger 2022-05-16 12:38:05 +02:00 committed by Alexander List
parent d6244c990d
commit 7c281536c7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/gluon-core/files/lib/netifd/proto/gluon_wired.sh
View File

@ -48,8 +48,8 @@ proto_gluon_wired_setup() {
local meshif="$config" local meshif="$config"
local transitive index vxlan vxpeer6addr local transitive index vxlan vxpeer6addr ipaddr ip6addr
json_get_vars transitive index vxlan vxpeer6addr json_get_vars transitive index vxlan vxpeer6addr ipaddr ip6addr
# default args # default args
[ -z "$vxlan" ] && vxlan=1 [ -z "$vxlan" ] && vxlan=1
@ -81,10 +81,10 @@ proto_gluon_wired_setup() {
json_add_string ifname "@${meshif}" json_add_string ifname "@${meshif}"
json_add_string proto 'gluon_mesh' json_add_string proto 'gluon_mesh'
json_add_boolean fixed_mtu 1 json_add_boolean fixed_mtu 1
if [ ! -n "$ipaddr" ]; then if [ ! -z "$ipaddr" ]; then
json_add_string ipaddr "$ipaddr" json_add_string ipaddr "$ipaddr"
fi fi
if [ ! -n "$ip6addr" ]; then if [ ! -z "$ip6addr" ]; then
json_add_string ip6addr "$ip6addr" json_add_string ip6addr "$ip6addr"
fi fi
[ -n "$transitive" ] && json_add_boolean transitive "$transitive" [ -n "$transitive" ] && json_add_boolean transitive "$transitive"