2022-12-06 14:26:37 +08:00
|
|
|
From 9f8fd81fab4fc0a8c48509c5f1eeb53be2c053af Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
|
|
|
Date: Sat, 3 Dec 2022 14:47:43 +0800
|
2022-12-16 19:13:40 -08:00
|
|
|
Subject: [PATCH 7/9] add add-gids option for exec
|
2022-12-06 14:26:37 +08:00
|
|
|
|
|
|
|
|
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
|
|
|
---
|
|
|
|
|
src/lcrcontainer.h | 1 +
|
|
|
|
|
src/lcrcontainer_execute.c | 3 +++
|
|
|
|
|
2 files changed, 4 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/lcrcontainer.h b/src/lcrcontainer.h
|
2022-12-16 19:13:40 -08:00
|
|
|
index a0510979..5cb36477 100644
|
2022-12-06 14:26:37 +08:00
|
|
|
--- a/src/lcrcontainer.h
|
|
|
|
|
+++ b/src/lcrcontainer.h
|
|
|
|
|
@@ -284,6 +284,7 @@ struct lcr_exec_request {
|
|
|
|
|
const char **console_fifos;
|
|
|
|
|
|
|
|
|
|
const char *user;
|
|
|
|
|
+ const char *add_gids;
|
|
|
|
|
|
|
|
|
|
const char **env;
|
|
|
|
|
size_t env_len;
|
|
|
|
|
diff --git a/src/lcrcontainer_execute.c b/src/lcrcontainer_execute.c
|
2022-12-16 19:13:40 -08:00
|
|
|
index 118f26c2..9f4e9515 100644
|
2022-12-06 14:26:37 +08:00
|
|
|
--- a/src/lcrcontainer_execute.c
|
|
|
|
|
+++ b/src/lcrcontainer_execute.c
|
|
|
|
|
@@ -870,6 +870,9 @@ static void execute_lxc_attach(const char *name, const char *path, const struct
|
|
|
|
|
add_array_elem(params, args_len, &i, "-u");
|
|
|
|
|
add_array_elem(params, args_len, &i, request->user);
|
|
|
|
|
}
|
|
|
|
|
+ if (request->add_gids != NULL) {
|
|
|
|
|
+ add_array_kv(params, args_len, &i, "--add-gids", request->add_gids);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
add_array_kv(params, args_len, &i, "--suffix", request->suffix);
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
2.25.1
|
|
|
|
|
|