summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2023-11-07 11:00:08 +0000
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2023-11-07 16:19:00 +0000
commitf216969a46f720bd7b74e7c1fbb88f88b4434a21 (patch)
treea4b8e831f40f75261458612ea9dad01239963b1e
parent11ca0a12272a704ce5f04c0ff4c746f755a380f1 (diff)
downloadvyos-1x-f216969a46f720bd7b74e7c1fbb88f88b4434a21.tar.gz
vyos-1x-f216969a46f720bd7b74e7c1fbb88f88b4434a21.zip
T5720: Fix for PPPoE-server adding new interfaces
If we add a new interface for PPPoe-server we MUST restart the `accel-ppp@pppoe.service` as `reload` is not implemented for accel-ppp daemon Otherwise we have listen interface in the /run/accel-pppd/pppoe.conf which does not work (cherry picked from commit ffda9068b22e2d8a6841fcd8cdf62bbe266ea02c)
-rwxr-xr-xsrc/conf_mode/service_pppoe-server.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/conf_mode/service_pppoe-server.py b/src/conf_mode/service_pppoe-server.py
index aace267a7..87660c127 100755
--- a/src/conf_mode/service_pppoe-server.py
+++ b/src/conf_mode/service_pppoe-server.py
@@ -48,9 +48,12 @@ def get_config(config=None):
# reload-or-restart does not implemented in accel-ppp
# use this workaround until it will be implemented
# https://phabricator.accel-ppp.org/T3
- if is_node_changed(conf, base + ['client-ip-pool']) or is_node_changed(
- conf, base + ['client-ipv6-pool']):
+ conditions = [is_node_changed(conf, base + ['client-ip-pool']),
+ is_node_changed(conf, base + ['client-ipv6-pool']),
+ is_node_changed(conf, base + ['interface'])]
+ if any(conditions):
pppoe.update({'restart_required': {}})
+
return pppoe
def verify(pppoe):