diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-06-11 10:41:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-11 10:41:09 +0200 |
| commit | dd813e5b79d612106b0bc7a064f9633be5da9571 (patch) | |
| tree | 7ba990980b5d06fd6d894f90e8f5495428644137 /src/migration-scripts | |
| parent | 397743ff553f5213757264c3825c4155380bbb7f (diff) | |
| parent | 2cbc4eb005fc936e37a34a1ef539d164f21f90b5 (diff) | |
| download | vyos-1x-dd813e5b79d612106b0bc7a064f9633be5da9571.tar.gz vyos-1x-dd813e5b79d612106b0bc7a064f9633be5da9571.zip | |
Merge pull request #3632 from c-po/fixup-firewall
firewall: T3900: fix migration and smoketests
Diffstat (limited to 'src/migration-scripts')
| -rwxr-xr-x | src/migration-scripts/firewall/15-to-16 | 5 |
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) |