1 Star 0 Fork 43

ilyakuksenok / lxc

forked from src-openEuler / lxc 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0015-fix-do-mask-pathes-after-parent-mounted.patch 1.33 KB
一键复制 编辑 原始数据 按行查看 历史
From 96a35e077d21a1abf1cc3819fb842b8089ee268d Mon Sep 17 00:00:00 2001
From: isuladci <isulad@ci.com>
Date: Tue, 20 Sep 2022 01:40:18 -0700
Subject: [PATCH] fix do mask pathes after parent mounted
Signed-off-by: isuladci <isulad@ci.com>
---
src/lxc/conf.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 378cf9f..439601a 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3975,19 +3975,19 @@ int lxc_setup(struct lxc_handler *handler)
}
#ifdef HAVE_ISULAD
- // isulad: setup rootfs masked paths
- if (!lxc_list_empty(&lxc_conf->rootfs.maskedpaths)) {
- if (setup_rootfs_maskedpaths(&lxc_conf->rootfs.maskedpaths)) {
- return log_error(-1, "failed to setup maskedpaths");
- }
- }
-
// isulad: setup rootfs ro paths
if (!lxc_list_empty(&lxc_conf->rootfs.ropaths)) {
if (setup_rootfs_ropaths(&lxc_conf->rootfs.ropaths)) {
return log_error(-1, "failed to setup readonlypaths");
}
}
+
+ // isulad: setup rootfs masked paths
+ if (!lxc_list_empty(&lxc_conf->rootfs.maskedpaths)) {
+ if (setup_rootfs_maskedpaths(&lxc_conf->rootfs.maskedpaths)) {
+ return log_error(-1, "failed to setup maskedpaths");
+ }
+ }
//isulad: system container, remount /proc/sys/xxx by mount_list
if (lxc_conf->systemd != NULL && strcmp(lxc_conf->systemd, "true") == 0) {
--
2.25.1
1
https://gitee.com/ilyakuksenok/lxc.git
git@gitee.com:ilyakuksenok/lxc.git
ilyakuksenok
lxc
lxc
master

搜索帮助