46 Commits

Author SHA1 Message Date
zhangxiaoyu
0b489d1d02 skip kill cgroup processes if no hierarchies
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 57e4c072b3f6a44a866f187d053815698f88ae1b)
2022-10-11 14:26:11 +08:00
Neil.wrz
14c0fa95b5 fix do mask paths after parent mounted
Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
(cherry picked from commit fc6467c52155f775a3738712ef2315943c098c7f)
2022-09-21 14:20:32 +08:00
Neil.wrz
b1b9eefb53 fix tools with -? option give error
Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
(cherry picked from commit 8023e24ff4676879cdfa01389d8e1c3e9002bcd4)
2022-09-03 17:17:58 +08:00
zhangxiaoyu
0c3d3f7955 return fail if no args or no rootfs path found
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 70a531a8677edc3e52bfd81e72f225667bd8b858)
2022-09-01 14:24:17 +08:00
haozi007
1133a5d372 only set user or image setting non-empty HOME
Signed-off-by: haozi007 <liuhao27@huawei.com>
(cherry picked from commit e35f3ad3dba97992b16c3299053699d7f90410f6)
2022-08-15 09:37:31 +08:00
haozi007
e00c7b3bc5 fix HOME env of container unset error
Signed-off-by: haozi007 <liuhao27@huawei.com>
(cherry picked from commit d97043c9d07b01f0d12e3bdaa5daff150bffe5b5)
2022-07-25 20:34:16 +08:00
WangFengTu
15a97423bf do not operate playload and attach cgroup if no controller found
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
(cherry picked from commit 862a52abbf9a4de1971126fb7b4ac7cb4d346004)
2022-05-23 20:27:11 +08:00
WangFengTu
bbba87ef33 do not free the pointer returned by dirname
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
(cherry picked from commit d8ee6459cc2ced2dd8c5f78123548b223c9551f7)
2022-04-22 14:35:39 +08:00
wujing
8ef5bb8f8a Refactor the way to convert selinux label to shared mode
Signed-off-by: wujing <wujing50@huawei.com>
(cherry picked from commit 9bb9704b1292e3da2264a17e0c7e2384137a10ac)
2022-04-19 11:03:01 +08:00
wujing
4bb59daf25 fix bug of memory free
Signed-off-by: wujing <wujing50@huawei.com>
(cherry picked from commit b4ff9620e4660aaebfe76dbee3fbc52e4946f15c)
2022-04-09 15:30:53 +08:00
haozi007
6d5c900167 fix unnecessary error message print
Signed-off-by: haozi007 <liuhao27@huawei.com>
(cherry picked from commit 0ab60710491349088b1251d1a4d32d587b02532b)
2022-03-17 11:04:27 +08:00
chegJH
e20309c2a3 fix print and len
Signed-off-by: chegJH <hejunjie10@huawei.com>
(cherry picked from commit a4b7c5728090d1c0b6374773f7ab9b1b909e9c1b)
2022-03-01 20:32:25 +08:00
chegJH
820f80727a changes for compile in andorid env
Signed-off-by: chegJH <hejunjie10@huawei.com>
(cherry picked from commit 07039681d8ff79eae4cad60bce31ca36b05c110b)
2022-03-01 20:28:47 +08:00
haozi007
c621fc19e1 adapt upstream compiler settings
Signed-off-by: haozi007 <liuhao27@huawei.com>
(cherry picked from commit 9c2f8c2de43241b02541c16825197259018d0703)
2021-12-28 14:14:15 +08:00
WangFengTu
fec64b9f7c cgfsng: fix cgroup attach cgroup creation
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
(cherry picked from commit d4cadf966de986a65cf48936541a75359e4e7cda)
2021-11-25 16:27:59 +08:00
WangFengTu
4145de0b8d conf: ensure that the idmap pointer itself is freed
see https://github.com/lxc/lxc/pull/3504

Signed-off-by: WangFengTu <wangfengtu@huawei.com>
(cherry picked from commit 10f4794cfe5e7b22ebe0b4084282c7daab7158af)
2021-11-19 10:53:16 +08:00
gaohuatao
f2c24d74c3 upgrade from upstream
Signed-off-by: gaohuatao <gaohuatao@huawei.com>
2021-11-11 20:21:11 +08:00
zhangxiaoyu
b9b9246793 fix conf memory leak
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit ae9b72d3dd0fc832db44a48ea4ef33decd451c20)
2021-09-18 16:53:32 +08:00
haozi007
572f115e2f just use origin loop if do not have io
Signed-off-by: haozi007 <liuhao27@huawei.com>
(cherry picked from commit 1ef014906b379cd895f8da3c2f28076fbeb3015b)
2021-09-17 15:49:18 +08:00
zhangxiaoyu
9e13d8d9c7 seccomp: init and destroy notifier.cookie
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit d65f9480282b2ef45a89469340260f28a8804fee)
2021-09-17 15:36:56 +08:00
haozi007
ce7c518014 add help info for new arguments
Signed-off-by: haozi007 <liuhao27@huawei.com>
(cherry picked from commit 7b8a0b190e021b098bb02670644644fbfe2398fd)
2021-08-27 09:39:59 +08:00
LiFeng
2ded120a82 lxc: fix coredump
Signed-off-by: LiFeng <lifeng68@huawei.com>
(cherry picked from commit ea1abd3b6908af4c962f82ac56df40f46913bc06)
2021-06-15 09:54:49 +08:00
Li Feng
d2f3c7c211 lxc: adjust log level
Signed-off-by: Li Feng <lifeng2221dd1@zoho.com.cn>
(cherry picked from commit 0280573c3d861dd246d62fd452ec4c142cc58ecf)
2021-05-13 15:44:08 +08:00
haozi007
1983ee295c support long syslog tag
Signed-off-by: haozi007 <liuhao27@huawei.com>
(cherry picked from commit a13f6581f4a2462c864a844a659c570a342bff54)
2021-05-08 14:48:12 +08:00
WangFengTu
61f6baac99 print error message if process workdir failed
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
(cherry picked from commit 8a0c8575a72073755a580d859d17ce9e33597d18)
2021-05-08 11:48:28 +08:00
WangFengTu
beda84cce7 some patches missing in series.conf
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
(cherry picked from commit a7c5b85d9565ee80f291187d34cb2112fa980b94)
2021-04-07 11:43:34 +08:00
Li Feng
dea6a9b8fc metrics: add total_inactive_file metric for memory
Signed-off-by: Li Feng <lifeng2221dd1@zoho.com.cn>
(cherry picked from commit 89bd000fc7cae30da91f74319ad01846f1a89e87)
2021-01-28 20:08:03 +08:00
Li Feng
fafce23c71 IO: fix io data miss when exec with pipes
Signed-off-by: Li Feng <lifeng2221dd1@zoho.com.cn>
(cherry picked from commit 8f92684f221407b147c1e5a7e2e382e88cd2afc1)
2021-01-20 14:51:11 +08:00
wujing
3c5c8fab9d fix compilation errors without libcap
Signed-off-by: wujing <wujing50@huawei.com>
2021-01-05 17:11:11 +08:00
wujing
c4e6c08f20 Streaming IO solution optimization and enhancement
Signed-off-by: wujing <wujing50@huawei.com>
2020-12-30 14:54:07 +08:00
lifeng68
4e0e4f9af1 mount: make possible to bind mount /proc and /sys/fs
1. add check whether have /proc mounts entry, if has, skip the auto mount proc
2. mount cgroup before do mount entrys
3. pass if the mount on top of /proc and the source of the mount is a proc filesystem

Signed-off-by: lifeng68 <lifeng68@huawei.com>
2020-11-28 10:21:49 +08:00
lifeng68
4abbd2a6d4 cgfsng: adjust log level from error to warn
Signed-off-by: lifeng68 <lifeng68@huawei.com>
2020-11-13 14:28:12 +08:00
wujing
79006e488c add patchs to series.conf
Signed-off-by: wujing <wujing50@huawei.com>
2020-10-10 10:11:47 +08:00
lifeng68
65db176e13 4.0.3: update base version to lxc_4.0.3
Signed-off-by: lifeng68 <lifeng68@huawei.com>
2020-07-16 14:16:25 +08:00
lifeng68
c294547322 lxc: set default cgroup pattern to lxc/%n
Signed-off-by: lifeng68 <lifeng68@huawei.com>
2020-05-27 17:23:11 +08:00
wangkang
721df3863b lxc: set normal ret value when populate exist device successfully
Signed-off-by: wangkang <wangkang101@huawei.com>
2020-05-22 14:55:38 +08:00
lifeng68
1988f5b60e lxc: fix build test error
Signed-off-by: lifeng68 <lifeng68@huawei.com>
2020-05-19 06:34:57 -04:00
gaohuatao
6360917592 lxc: disable terminal stdout/stderr pipe O_NONBLOCK
Signed-off-by: gaohuatao <gaohuatao@huawei.com>
(cherry picked from commit b0c40098c822ec7931540c37764a463a78acda08)
Signed-off-by: gaohuatao <gaohuatao@huawei.com>
2020-05-14 08:36:52 -04:00
LiFeng
e3d6e34bff lxc: fix hook memory leak
Signed-off-by: LiFeng <lifeng68@huawei.com>
2020-05-11 14:03:58 +08:00
haozi007
ae5066704c change log level of seccomp setup
Signed-off-by: haozi007 <liuhao27@huawei.com>
2020-05-06 23:31:58 -04:00
LiFeng
32ea3051be mount: use parsed symlink path as mount target
Signed-off-by: LiFeng <lifeng68@huawei.com>
2020-04-30 19:24:41 +08:00
LiFeng
c4b795a9ec attch: add err msg when call attach failed
Signed-off-by: LiFeng <lifeng68@huawei.com>
2020-04-30 17:09:05 +08:00
haozi007
aae39486b6 set state to stopped
if cmd is timeout

Signed-off-by: haozi007 <liuhao27@huawei.com>
2020-04-28 11:53:58 +08:00
lifeng
62d859727b LTS: update lxc to 4.0.1
Signed-off-by: lifeng <lifeng68@huawei.com>
2020-04-27 10:40:43 +08:00
LiFeng
c1c967d9bc lxc: make lxc-libs package
Signed-off-by: LiFeng <lifeng68@huawei.com>
2020-02-14 06:13:22 -05:00
LiFeng
dd27053fff lxc: add apply patch scripts
Signed-off-by: LiFeng <lifeng68@huawei.com>
2020-01-09 08:56:03 -05:00