diff options
author | Christian Breunig <christian@breunig.cc> | 2023-12-21 17:16:27 +0100 |
---|---|---|
committer | Christian Breunig <christian@breunig.cc> | 2023-12-21 17:16:27 +0100 |
commit | 4789956dcac5961c02ca2399acb7bde8a3f8df99 (patch) | |
tree | 451f6548082d1212221fb89ae3d2ba938f0cf6c4 /src/conf_mode | |
parent | eac5251c4c804c580fe9f3c3d6c6f6e355fca6d1 (diff) | |
download | vyos-1x-4789956dcac5961c02ca2399acb7bde8a3f8df99.tar.gz vyos-1x-4789956dcac5961c02ca2399acb7bde8a3f8df99.zip |
nat66: T2898: build fix after ndp-proxy backport
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-x | src/conf_mode/nat66.py | 11 |
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 |