summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-06-11 09:49:11 +0200
committerChristian Breunig <christian@breunig.cc>2024-06-11 09:51:15 +0200
commit2cbc4eb005fc936e37a34a1ef539d164f21f90b5 (patch)
tree451204ef658cda518c16b99ca22c419bb779ba0f /src
parent50a5a29ae128795d718a3ed6878887d49544f54d (diff)
downloadvyos-1x-2cbc4eb005fc936e37a34a1ef539d164f21f90b5.tar.gz
vyos-1x-2cbc4eb005fc936e37a34a1ef539d164f21f90b5.zip
firewall: T3900: fix migration and smoketests
Commit 770edf016838523 ("T3900: T6394: extend functionalities in firewall") changed the position in the CLI for conntrack timeout. This lead to failing smoketests because of a regression in the migrator.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/migration-scripts/firewall/15-to-165
1 files changed, 3 insertions, 2 deletions
diff --git a/src/migration-scripts/firewall/15-to-16 b/src/migration-scripts/firewall/15-to-16
index 7c8d38fe6..28df1256e 100755
--- a/src/migration-scripts/firewall/15-to-16
+++ b/src/migration-scripts/firewall/15-to-16
@@ -42,8 +42,9 @@ if not config.exists(conntrack_base):
for protocol in ['icmp', 'tcp', 'udp', 'other']:
if config.exists(conntrack_base + [protocol]):
- if not config.exists(firewall_base):
+ if not config.exists(firewall_base + ['timeout']):
config.set(firewall_base + ['timeout'])
+
config.copy(conntrack_base + [protocol], firewall_base + ['timeout', protocol])
config.delete(conntrack_base + [protocol])
@@ -52,4 +53,4 @@ try:
f.write(config.to_string())
except OSError as e:
print("Failed to save the modified config: {}".format(e))
- exit(1) \ No newline at end of file
+ exit(1)