summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2023-12-21 16:18:18 +0000
committerGitHub <noreply@github.com>2023-12-21 16:18:18 +0000
commitda86681d04fd1c3d23f3c5bd898fbec9e0e6535a (patch)
treed4b35f42410ffaa028082385f8481c9a774d0d27
parent04f745123a71c1ae330b02e263fa42e310aee4da (diff)
parent4789956dcac5961c02ca2399acb7bde8a3f8df99 (diff)
downloadvyos-1x-da86681d04fd1c3d23f3c5bd898fbec9e0e6535a.tar.gz
vyos-1x-da86681d04fd1c3d23f3c5bd898fbec9e0e6535a.zip
Merge pull request #2675 from c-po/nat66-fix-sagitta
nat66: T2898: build fix after ndp-proxy backport
-rwxr-xr-xsrc/conf_mode/nat66.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py
index 393be998f..990d6132e 100755
--- a/src/conf_mode/nat66.py
+++ b/src/conf_mode/nat66.py
@@ -147,17 +147,6 @@ def apply(nat):
return None
cmd(f'nft -f {nftables_nat66_config}')
-<<<<<<< HEAD
-
- if 'deleted' in nat or not dict_search('source.rule', nat):
- cmd('systemctl stop ndppd')
- if os.path.isfile(ndppd_config):
- os.unlink(ndppd_config)
- else:
- cmd('systemctl restart ndppd')
-=======
- call_dependents()
->>>>>>> 4d721a580 (T2898: add ndp-proxy service)
return None