summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2020-08-28 15:50:25 -0500
committerJohn Estabrook <jestabro@vyos.io>2020-08-31 09:57:00 -0500
commiteeeab0197c6e54eda5c2ec59a91f93403618a58b (patch)
tree94fe3de7e48fbf770b4470d78a975f07cf5b7b11 /python
parentd469e2f56e299a9d767d7db1f00646741f7ce367 (diff)
downloadvyos-1x-eeeab0197c6e54eda5c2ec59a91f93403618a58b.tar.gz
vyos-1x-eeeab0197c6e54eda5c2ec59a91f93403618a58b.zip
configd: T2582: inject shim env variable into configsession
ConfigSession needs to have required env vars manully injected; add the shim definition env var to the list, if config daemon is active.
Diffstat (limited to 'python')
-rw-r--r--python/vyos/configsession.py7
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