summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-10-03 20:36:18 +0200
committerChristian Poessinger <christian@poessinger.com>2020-10-03 20:36:18 +0200
commit585aaf9c5770e2a0784849aee75213bd4ea1871a (patch)
tree476c918d2ec10eb12022a6a2432361c6b17a09b3 /src
parentc79f9144a6bac9b1dbdffcd6a02762a6adeabcfa (diff)
downloadvyos-1x-585aaf9c5770e2a0784849aee75213bd4ea1871a.tar.gz
vyos-1x-585aaf9c5770e2a0784849aee75213bd4ea1871a.zip
sstp: T2953: migrate mtu to common level
Preparation before using get_config_dict() and common Jinja2 templates.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/vpn_sstp.py1
-rwxr-xr-xsrc/migration-scripts/sstp/2-to-35
2 files changed, 5 insertions, 1 deletions
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index a4a17de9c..15fcfcef3 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -270,7 +270,6 @@ def get_config(config=None):
#
# read in network settings
- conf.set_level(base_path + ['network-settings'])
if conf.exists(['mtu']):
sstp['mtu'] = conf.return_value(['mtu'])
diff --git a/src/migration-scripts/sstp/2-to-3 b/src/migration-scripts/sstp/2-to-3
index db705f5eb..dc96a2d30 100755
--- a/src/migration-scripts/sstp/2-to-3
+++ b/src/migration-scripts/sstp/2-to-3
@@ -44,6 +44,11 @@ else:
config.copy(config_ns, base_path + ['name-server'])
config.delete(config_ns)
+ config_mtu = base_path + ['network-settings', 'mtu']
+ if config.exists(config_mtu):
+ config.copy(config_mtu, base_path + ['mtu'])
+ config.delete(config_mtu)
+
try:
with open(file_name, 'w') as f:
f.write(config.to_string())