summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-07 19:24:39 +0100
committerChristian Poessinger <christian@poessinger.com>2021-02-07 19:55:47 +0100
commitf334abf4859bb7433486efd4c293ae4bdc503267 (patch)
tree1e70826af66faed6d6454ee88418c65ff5615d8c
parent46eb4ee5634517a5e0ff9312cfed5519eca962ac (diff)
downloadvyos-1x-f334abf4859bb7433486efd4c293ae4bdc503267.tar.gz
vyos-1x-f334abf4859bb7433486efd4c293ae4bdc503267.zip
system: T2486: bugfix name-servers-dhcp NameError on vif-c interfaces
Commit 0f8beae7426 ("system: T2486: migrate disable-dhcp-nameservers to name-servers-dhcp") added a migration script for moving the name-servers. A small glitch was introduced when referencing vif-c interfaces unter a vif-s interface where a variable got referenced which was not defined. (cherry picked from commit 89108f629ec8cc6990473468c1c67ffa8742b884)
-rwxr-xr-xsrc/migration-scripts/system/18-to-194
1 files changed, 2 insertions, 2 deletions
diff --git a/src/migration-scripts/system/18-to-19 b/src/migration-scripts/system/18-to-19
index dd2abce00..fd0e15d42 100755
--- a/src/migration-scripts/system/18-to-19
+++ b/src/migration-scripts/system/18-to-19
@@ -80,8 +80,8 @@ else:
dhcp_interfaces.append(f'{intf}.{vif_s}')
# try vif-c
- if config.exists(intf_base + ['vif-c', vif_c]):
- for vif_c in config.list_nodes(vif_s_base + ['vif-c', vif_c]):
+ if config.exists(intf_base + ['vif-c']):
+ for vif_c in config.list_nodes(vif_s_base + ['vif-c']):
vif_c_base = vif_s_base + ['vif-c', vif_c]
if config.exists(vif_c_base + ['address']):
for addr in config.return_values(vif_c_base + ['address']):