summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-13 10:15:17 +0200
committerGitHub <noreply@github.com>2020-04-13 10:15:17 +0200
commit1fa62cd27ad535669cd62cb2e0560ff840681281 (patch)
treef0135667b533055df640ed786f1f7a115a17029c /src/conf_mode
parentd3b17a9f383ebf2f34edcbd1c0e2e911f6ecaeba (diff)
parent7e7d2799784d80563d5b07fdf6f483c716713bd8 (diff)
downloadvyos-1x-1fa62cd27ad535669cd62cb2e0560ff840681281.tar.gz
vyos-1x-1fa62cd27ad535669cd62cb2e0560ff840681281.zip
Merge pull request #338 from thomas-mangin/T2028-boot
tunnel: T2028: fix issue when booting without gre remote
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces-tunnel.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py
index 19538da72..c51048aeb 100755
--- a/src/conf_mode/interfaces-tunnel.py
+++ b/src/conf_mode/interfaces-tunnel.py
@@ -584,11 +584,17 @@ def apply(conf):
if changes['section'] in 'create' and option in tunnel.options:
# it was setup at creation
continue
+ if not options[option]:
+ # remote can be set to '' and it would generate an invalide command
+ continue
tunnel.set_interface(option, options[option])
# set other interface properties
for option in ('alias', 'mtu', 'link_detect', 'multicast', 'allmulticast',
'vrf', 'ipv6_autoconf', 'ipv6_forwarding', 'ipv6_dad_transmits'):
+ if not options[option]:
+ # should never happen but better safe
+ continue
tunnel.set_interface(option, options[option])
# Configure interface address(es)