diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-03-12 13:06:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 13:06:43 +0100 |
| commit | a4e21377271cfcf6359ed23db8a90129e264ba4d (patch) | |
| tree | 22f3b30eae75027cb514290efc10b9777abcbe31 /src | |
| parent | f33657534fb6e5253a88a04aa57fee6341b92a87 (diff) | |
| parent | 246b3e17e067f59bc5f3afa678eda17a9390eb4b (diff) | |
| download | vyos-1x-a4e21377271cfcf6359ed23db8a90129e264ba4d.tar.gz vyos-1x-a4e21377271cfcf6359ed23db8a90129e264ba4d.zip | |
Merge pull request #3120 from lucasec/t6114
T6114: fix broken migration dhcpv6-server 4-to-5
Diffstat (limited to 'src')
| -rwxr-xr-x | src/migration-scripts/dhcpv6-server/4-to-5 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/migration-scripts/dhcpv6-server/4-to-5 b/src/migration-scripts/dhcpv6-server/4-to-5 index ae506b9c5..55fda91b3 100755 --- a/src/migration-scripts/dhcpv6-server/4-to-5 +++ b/src/migration-scripts/dhcpv6-server/4-to-5 @@ -42,8 +42,11 @@ def find_subnet_interface(subnet): def check_addr(if_path): if config.exists(if_path + ['address']): for addr in config.return_values(if_path + ['address']): - if ip_network(addr, strict=False) == subnet_net: - return True + try: + if ip_network(addr, strict=False) == subnet_net: + return True + except: + pass # interface address was probably "dhcp" or other magic string return None for iftype in config.list_nodes(['interfaces']): |