diff options
| author | John Estabrook <jestabro@vyos.io> | 2020-08-31 11:23:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 11:23:06 -0500 |
| commit | 621fcb078abb53888e995a007fb9ea31e95e34ab (patch) | |
| tree | a4dda1096a267fed41ac90121ab6233e5b8b7d39 /python/vyos | |
| parent | bd076f694a763991a0b0d3a7bb0fa5d194d56d7c (diff) | |
| parent | ad69fb36201ee0930b76d80f0869284e26846991 (diff) | |
| download | vyos-1x-621fcb078abb53888e995a007fb9ea31e95e34ab.tar.gz vyos-1x-621fcb078abb53888e995a007fb9ea31e95e34ab.zip | |
Merge pull request #535 from jestabro/vyos-configd
configd: T2582: vyos config script daemon
configd: T2582: add scripts to include list for daemon
configd: T2808: add smoketest to ensure script consistency with daemon
configd: T2582: add utility to safely add/remove items from include file
configd: T2582: add shim var to node.def
configd: T2582: inject shim env variable into configsession
configd: T2582: add shim as config daemon client
configd: T2582: add mkjson for use by shim
configd: T2582: add config daemon and supporting files
Diffstat (limited to 'python/vyos')
| -rw-r--r-- | python/vyos/configsession.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py index 0994fd974..6e4214360 100644 --- a/python/vyos/configsession.py +++ b/python/vyos/configsession.py @@ -17,6 +17,8 @@ import re import sys import subprocess +from vyos.util import call + CLI_SHELL_API = '/bin/cli-shell-api' SET = '/opt/vyatta/sbin/my_set' DELETE = '/opt/vyatta/sbin/my_delete' @@ -69,6 +71,11 @@ def inject_vyos_env(env): env['vyos_sbin_dir'] = '/usr/sbin' env['vyos_validators_dir'] = '/usr/libexec/vyos/validators' + # if running the vyos-configd daemon, inject the vyshim env var + ret = call('systemctl is-active --quiet vyos-configd.service') + if not ret: + env['vyshim'] = '/usr/sbin/vyshim' + return env |