72c0373b1d
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit 012e30c2a8669c89cbe239cf4fba26d1456677c8)
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From 7e515f8f42af1cdbd87442b0ea74fa934ee25576 Mon Sep 17 00:00:00 2001
|
|
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
Date: Fri, 31 Mar 2023 09:49:59 +0800
|
|
Subject: [PATCH] use ocihooks env after getenv
|
|
|
|
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
---
|
|
src/lxc/conf.c | 13 +++++++------
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
|
|
index 19cf5e3..b31ba38 100644
|
|
--- a/src/lxc/conf.c
|
|
+++ b/src/lxc/conf.c
|
|
@@ -4461,7 +4461,8 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
|
|
{
|
|
char **result = NULL;
|
|
size_t result_len = env_len;
|
|
- size_t i, j;
|
|
+ size_t i = 0;
|
|
+ size_t j, k;
|
|
char *tmpenv = NULL;
|
|
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"
|
|
@@ -4476,11 +4477,6 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
|
|
return NULL;
|
|
memset(result, 0, sizeof(char *) * result_len);
|
|
|
|
- for(i = 0; i < env_len; i++) {
|
|
- if (oldenvs[i])
|
|
- result[i] = safe_strdup(oldenvs[i]);
|
|
- }
|
|
-
|
|
for(j = 0; j < (sizeof(lxc_envs) / sizeof(char *)); j++) {
|
|
size_t env_buf_len = 0;
|
|
tmpenv = getenv(lxc_envs[j]);
|
|
@@ -4504,6 +4500,11 @@ static char **merge_ocihook_env(char **oldenvs, size_t env_len, size_t *merge_en
|
|
}
|
|
}
|
|
|
|
+ for(k = 0; k < env_len; k++) {
|
|
+ if (oldenvs[k] && i < (result_len - 1))
|
|
+ result[i++] = safe_strdup(oldenvs[k]);
|
|
+ }
|
|
+
|
|
*merge_env_len = i;
|
|
return result;
|
|
}
|
|
--
|
|
2.25.1
|
|
|