2019-12-25 15:57:42 +08:00
|
|
|
From b7c3e38d912794fcbba5a3fc4ed185adff58c72d Mon Sep 17 00:00:00 2001
|
2019-09-30 11:03:07 -04:00
|
|
|
From: liuhao <liuhao27@huawei.com>
|
|
|
|
|
Date: Thu, 4 Apr 2019 17:21:56 +0800
|
2019-12-25 15:57:42 +08:00
|
|
|
Subject: [PATCH 079/131] inherid env from parent in oci hooks
|
2019-09-30 11:03:07 -04:00
|
|
|
|
|
|
|
|
env: LD_LIBRAY_PAHT and PATH
|
|
|
|
|
|
|
|
|
|
Signed-off-by: liuhao <liuhao27@huawei.com>
|
|
|
|
|
Signed-off-by: LiFeng <lifeng68@huawei.com>
|
|
|
|
|
---
|
|
|
|
|
src/lxc/conf.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
|
2019-12-25 15:57:42 +08:00
|
|
|
index a9421c5f..20eb8408 100644
|
2019-09-30 11:03:07 -04:00
|
|
|
--- a/src/lxc/conf.c
|
|
|
|
|
+++ b/src/lxc/conf.c
|
|
|
|
|
@@ -4420,7 +4420,7 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
|
|
|
|
|
size_t result_len = env_len;
|
|
|
|
|
size_t i, j;
|
|
|
|
|
char *tmpenv;
|
|
|
|
|
- char *lxc_envs[] = {"LXC_CGNS_AWARE", "LXC_PID", "LXC_ROOTFS_MOUNT",
|
|
|
|
|
+ char *lxc_envs[] = {"LD_LIBRARY_PATH", "PATH", "LXC_CGNS_AWARE", "LXC_PID", "LXC_ROOTFS_MOUNT",
|
|
|
|
|
"LXC_CONFIG_FILE", "LXC_CGROUP_PATH", "LXC_ROOTFS_PATH", "LXC_NAME"};
|
|
|
|
|
char *lxcenv_buf;
|
|
|
|
|
|
|
|
|
|
--
|
2019-12-25 15:57:42 +08:00
|
|
|
2.23.0
|
2019-09-30 11:03:07 -04:00
|
|
|
|
