packages/lxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!330 do not check rootfs.path, it may be null if rootfs is "/"

Browse Source 
From: @wangfengtu 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2022-08-20 07:07:17 +00:00 committed by Gitee
commit c66650aef5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0014-do-not-check-rootfs.path-it-may-be-null-if-rootfs-is.patch Normal file
View File

@ -0,0 +1,26 @@
From 781ccccd4074b3b998e7085729409ed1beacf828 Mon Sep 17 00:00:00 2001
From: WangFengTu <wangfengtu@huawei.com>
Date: Sat, 20 Aug 2022 14:46:36 +0800
Subject: [PATCH] do not check rootfs.path, it may be null if rootfs is "/"
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
---
src/lxc/lxccontainer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 2133782..4b669bb 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -1031,7 +1031,7 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
}
// do not allow using default rootfs path when isulad
- if (conf->rootfs.mount == NULL || conf->rootfs.path == NULL) {
+ if (conf->rootfs.mount == NULL) {
ERROR("Empty rootfs path detected");
lxc_put_handler(handler);
return false;
--
2.25.1

9
lxc.spec
View File

@ -1,4 +1,4 @@
%global _release 2022081901
%global _release 2022082001
Name: lxc
Version: 4.0.3
@ -21,6 +21,7 @@ Patch0010: 0010-check-yajl-only-when-have-isulad.patch
Patch0011: 0011-drop-security_context_t.patch
Patch0012: 0012-only-set-user-or-image-set-non-empty-HOME.patch
Patch0013: 0013-return-fail-if-no-args-or-no-rootfs-path-found.patch
Patch0014: 0014-do-not-check-rootfs.path-it-may-be-null-if-rootfs-is.patch
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
BuildRequires: pkgconfig(libseccomp)
@ -192,6 +193,12 @@ make check
%{_mandir}/*/man7/%{name}*
%changelog
* Sat Aug 20 2022 wangfengtu<wangfengtu@huawei.com> - 4.0.3-2022082001
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: do not check rootfs.path, it may be null if rootfs is "/"
* Fri Aug 19 2022 wangfengtu<wangfengtu@huawei.com> - 4.0.3-2022081901
- Type:bugfix
- ID:NA