30 lines
958 B
Diff
30 lines
958 B
Diff
From e87fd4a3b69a4c98d2c50ede559d56b43f65578a Mon Sep 17 00:00:00 2001
|
|
From: liuhao <liuhao27@huawei.com>
|
|
Date: Thu, 4 Apr 2019 17:21:56 +0800
|
|
Subject: [PATCH 079/140] inherid env from parent in oci hooks
|
|
|
|
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
|
|
index a9421c5..20eb840 100644
|
|
--- 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;
|
|
|
|
--
|
|
1.8.3.1
|
|
|