From 7c281536c737a2b94597d9106c4b54bd9574e51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 16 May 2022 12:38:05 +0200 Subject: [PATCH] gluon-core: fixup passing ipaddr from wired --- package/gluon-core/files/lib/netifd/proto/gluon_wired.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gluon-core/files/lib/netifd/proto/gluon_wired.sh b/package/gluon-core/files/lib/netifd/proto/gluon_wired.sh index 3f7a8c10..5a4df9fd 100755 --- a/package/gluon-core/files/lib/netifd/proto/gluon_wired.sh +++ b/package/gluon-core/files/lib/netifd/proto/gluon_wired.sh @@ -48,8 +48,8 @@ proto_gluon_wired_setup() { local meshif="$config" - local transitive index vxlan vxpeer6addr - json_get_vars transitive index vxlan vxpeer6addr + local transitive index vxlan vxpeer6addr ipaddr ip6addr + json_get_vars transitive index vxlan vxpeer6addr ipaddr ip6addr # default args [ -z "$vxlan" ] && vxlan=1 @@ -81,10 +81,10 @@ proto_gluon_wired_setup() { json_add_string ifname "@${meshif}" json_add_string proto 'gluon_mesh' json_add_boolean fixed_mtu 1 - if [ ! -n "$ipaddr" ]; then + if [ ! -z "$ipaddr" ]; then json_add_string ipaddr "$ipaddr" fi - if [ ! -n "$ip6addr" ]; then + if [ ! -z "$ip6addr" ]; then json_add_string ip6addr "$ip6addr" fi [ -n "$transitive" ] && json_add_boolean transitive "$transitive"