diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-12-03 17:36:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 17:36:47 +0100 |
| commit | a0f115fb4304e29c38cb74d3be4969aa8136ae9d (patch) | |
| tree | 3d74556de49525146f361c4bfd68493c9ac2140b | |
| parent | 4e4746f50a9eef25bd06f1dbeb0f0393ca8ec99c (diff) | |
| parent | 4c15e140baaac7d1915e53284683f264e30ed6e1 (diff) | |
| download | vyos-1x-a0f115fb4304e29c38cb74d3be4969aa8136ae9d.tar.gz vyos-1x-a0f115fb4304e29c38cb74d3be4969aa8136ae9d.zip | |
Merge pull request #631 from DmitriyEshenko/vyos-1x-pim02
pim: igmp: T2744: Define the absolute path to pimd
| -rwxr-xr-x | src/conf_mode/protocols_igmp.py | 5 | ||||
| -rwxr-xr-x | src/conf_mode/protocols_pim.py | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/conf_mode/protocols_igmp.py b/src/conf_mode/protocols_igmp.py index 8606e7364..28d560d03 100755 --- a/src/conf_mode/protocols_igmp.py +++ b/src/conf_mode/protocols_igmp.py @@ -28,6 +28,9 @@ from signal import SIGTERM from vyos import airbag airbag.enable() +# Required to use the full path to pimd, in another case daemon will not be started +pimd_cmd = f'/usr/lib/frr/pimd -d -F traditional --daemon -A 127.0.0.1' + config_file = r'/tmp/igmp.frr' def get_config(config=None): @@ -115,7 +118,7 @@ def apply(igmp): pim_pid = process_named_running('pimd') if igmp['igmp_conf'] or igmp['pim_conf']: if not pim_pid: - call(f'pimd -d -F traditional --daemon -A 127.0.0.1') + call(pimd_cmd) if os.path.exists(config_file): call(f'vtysh -d pimd -f {config_file}') diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py index 8a9f034d5..df2e6f941 100755 --- a/src/conf_mode/protocols_pim.py +++ b/src/conf_mode/protocols_pim.py @@ -28,6 +28,9 @@ from signal import SIGTERM from vyos import airbag airbag.enable() +# Required to use the full path to pimd, in another case daemon will not be started +pimd_cmd = f'/usr/lib/frr/pimd -d -F traditional --daemon -A 127.0.0.1' + config_file = r'/tmp/pimd.frr' def get_config(config=None): @@ -142,7 +145,7 @@ def apply(pim): pim_pid = process_named_running('pimd') if pim['igmp_conf'] or pim['pim_conf']: if not pim_pid: - call(f'pimd -d -F traditional --daemon -A 127.0.0.1') + call(pimd_cmd) if os.path.exists(config_file): call("vtysh -d pimd -f " + config_file) |