summaryrefslogtreecommitdiff
path: root/src/services/vyos-configd
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2024-07-30 08:27:49 -0500
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-08-13 00:46:39 +0000
commita55e35470a4b76cab4193e287235f8c6900b6a58 (patch)
treec4a59402eb5fd44e1ec934d1492b169dc2ab7edb /src/services/vyos-configd
parentc50c55b93027d9000fa4fd966197402c1422ed3f (diff)
downloadvyos-1x-a55e35470a4b76cab4193e287235f8c6900b6a58.tar.gz
vyos-1x-a55e35470a4b76cab4193e287235f8c6900b6a58.zip
configd: T6633: inject missing env vars for configfs utilitymergify/bp/circinus/pr-3937
(cherry picked from commit a9024f302fd9657a0e6ef274cfc1dedccaf9d1a3)
Diffstat (limited to 'src/services/vyos-configd')
-rwxr-xr-xsrc/services/vyos-configd10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/services/vyos-configd b/src/services/vyos-configd
index 69ee15bf1..d797e90cf 100755
--- a/src/services/vyos-configd
+++ b/src/services/vyos-configd
@@ -182,6 +182,12 @@ def initialization(socket):
sudo_user_string = socket.recv().decode("utf-8", "ignore")
resp = "sudo_user"
socket.send(resp.encode())
+ temp_config_dir_string = socket.recv().decode("utf-8", "ignore")
+ resp = "temp_config_dir"
+ socket.send(resp.encode())
+ changes_only_dir_string = socket.recv().decode("utf-8", "ignore")
+ resp = "changes_only_dir"
+ socket.send(resp.encode())
logger.debug(f"config session pid is {pid_string}")
logger.debug(f"config session sudo_user is {sudo_user_string}")
@@ -198,6 +204,10 @@ def initialization(socket):
session_mode = 'a'
os.environ['SUDO_USER'] = sudo_user_string
+ if temp_config_dir_string:
+ os.environ['VYATTA_TEMP_CONFIG_DIR'] = temp_config_dir_string
+ if changes_only_dir_string:
+ os.environ['VYATTA_CHANGES_ONLY_DIR'] = changes_only_dir_string
try:
configsource = ConfigSourceString(running_config_text=active_string,