summaryrefslogtreecommitdiff
path: root/0152-add-omitted-macro-definition.patch
diff options
context:
space:
mode:
Diffstat (limited to '0152-add-omitted-macro-definition.patch')
-rw-r--r--0152-add-omitted-macro-definition.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/0152-add-omitted-macro-definition.patch b/0152-add-omitted-macro-definition.patch
new file mode 100644
index 0000000..630282f
--- /dev/null
+++ b/0152-add-omitted-macro-definition.patch
@@ -0,0 +1,48 @@
+From 9aadae1a71243bab41f5bf43c60f8f1b72806d54 Mon Sep 17 00:00:00 2001
+From: zhongtao <zhongtao17@huawei.com>
+Date: Fri, 22 Nov 2024 02:40:13 +1400
+Subject: [PATCH 152/156] add omitted macro definition
+
+Signed-off-by: zhongtao <zhongtao17@huawei.com>
+---
+ src/daemon/modules/api/runtime_api.h | 2 ++
+ src/daemon/modules/service/service_container.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/daemon/modules/api/runtime_api.h b/src/daemon/modules/api/runtime_api.h
+index 930710ca..1f23efe3 100644
+--- a/src/daemon/modules/api/runtime_api.h
++++ b/src/daemon/modules/api/runtime_api.h
+@@ -84,7 +84,9 @@ typedef struct _rt_create_params_t {
+ bool tty;
+ bool open_stdin;
+ const char *task_addr;
++#ifdef ENABLE_NO_PIVOT_ROOT
+ bool no_pivot_root;
++#endif
+ } rt_create_params_t;
+
+ typedef struct _rt_start_params_t {
+diff --git a/src/daemon/modules/service/service_container.c b/src/daemon/modules/service/service_container.c
+index 754c28ac..8e80e936 100644
+--- a/src/daemon/modules/service/service_container.c
++++ b/src/daemon/modules/service/service_container.c
+@@ -743,6 +743,7 @@ static int do_oci_spec_update(const char *id, oci_runtime_spec *oci_spec, contai
+ return 0;
+ }
+
++#ifdef ENABLE_NO_PIVOT_ROOT
+ static bool pack_no_pivot_root(const container_t *cont)
+ {
+ size_t i = 0;
+@@ -759,6 +760,7 @@ static bool pack_no_pivot_root(const container_t *cont)
+ }
+ return ret;
+ }
++#endif
+
+ static int do_start_container(container_t *cont, const char *console_fifos[], bool reset_rm, pid_ppid_info_t *pid_info)
+ {
+--
+2.34.1
+