89 Commits

Author SHA1 Message Date
zhangxiaoyu
72c0373b1d use ocihooks env after getenv
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 012e30c2a8669c89cbe239cf4fba26d1456677c8)
2023-03-31 10:52:24 +08:00
Neil.wrz
ce6d9492eb fix null ops hierarchies cause coredump
Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
(cherry picked from commit 3e7c0a2fd6dbc43dc2bed7d014be66c8deddcb07)
2023-02-23 16:42:06 +08:00
Neil.wrz
fc004bf19c do not check yajl when not have isulad
Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
(cherry picked from commit 9a5664be33ef690eea5812756353aa21040c87ef)
2023-02-22 11:01:16 +08:00
zhangxiaoyu
d60d48017a remove process inheritable capabilities
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit f10a758ebd8f96de1f6a5f578f69907291a3f8c1)
2023-02-21 10:55:37 +08:00
Wenlong Zhang
d62574d2d3 add loongarch64 support for lxc
(cherry picked from commit 972e37f7a0df10f73406f62c0ac157b6e36327d1)
2023-02-21 09:40:27 +08:00
songbuhuang
1edaca0f22 fix lxc write error message
Signed-off-by: songbuhuang <544824346@qq.com>
(cherry picked from commit 4c32cee5def14a1d364b57903b3547a3c5ec0d8c)
2023-02-09 09:20:20 +08:00
Neil.wrz
2d3e4066fb fix cve CVE-2022047952 log leaks root information
Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
(cherry picked from commit 7d3cb098866927270b6f0bfe1847211f495857ff)
2023-01-13 15:57:35 +08:00
zhongtao
5ad1739d59 add sscanf adapation code for musl
Signed-off-by: zhongtao <zhongtao17@huawei.com>
(cherry picked from commit 85dd10f091ce9e3c5e538eeeccfd4708f0ba12bc)
2023-01-05 11:24:30 +08:00
zhangxiaoyu
219fbf8d4b rollback strprint code modified
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit a8901d46cf940aedcde48d1b038aa059b3935fcb)
2022-12-27 10:16:46 +08:00
songbuhuang
b4ed7e092b change the suffi parameter in lxc attach --help output
Signed-off-by: songbuhuang <544824346@qq.com>
(cherry picked from commit b770bb5ae9a4a431ea5cf2f882be9d735496e245)
2022-12-19 14:07:51 +08:00
zhangxiaoyu
0c2cd4d48c add lxc-attach add-gids option
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 7c05174f1bafb3a198dddace687ae0df42ff1dc8)
2022-12-06 10:54:40 +08:00
zhangxiaoyu
967b507f4b add macro to adapt musl libc
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 025865aed90f633aad390c4802590c1bd3999ac5)
2022-11-29 17:34:54 +08:00
Neil.wrz
cca441ed56 rm duplicate AUTHORS and README
Signed-off-by: Neil.wrz <wangrunze13@huawei.com>
(cherry picked from commit 04ff1d5f8e162f0856ef3e1bf99b62411d4c2c4e)
2022-11-29 16:40:07 +08:00
wzx
2bb51cd5de Add sw64 architecture
Signed-off-by: wzx <wuzx1226@qq.com>
(cherry picked from commit 34020156caf7cc8c6da7f0b03461e7e8e728d5b3)
2022-11-08 09:38:12 +08:00
zhangxiaoyu
88996e4a37 update version to 4.0.3-2022101701
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 3f02f92b830b491992d14c05c974da56203af6a3)
2022-10-17 15:03:17 +08:00
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
d639aa06ae fix changelog error
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 96da939bdd6150d93859d5680ff90bdc2b87e68b)
2022-09-01 20:10:33 +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
zhangxiaoyu
ebb27d8b05 fix changelog date
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 8089904cc1fc03704f4bbdda4aef2161fe5fe971)
2022-08-02 10:57:39 +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
zhangshaoning
01675a827a fix bogus date
(cherry picked from commit 68691904188b7feb7b91a451b8cbe7996338ee31)
2022-06-28 16:19:31 +08:00
chegJH
1869d15993 update license
Signed-off-by: chegJH <hejunjie10@huawei.com>
(cherry picked from commit 1b5149bca32f1d1b590ac426fa279afcc9c5a7e6)
2022-05-25 11:29:09 +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
b910d96f8e add x permission when create directory
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
(cherry picked from commit 45fb43c93eed306f02011a6046e18e22e54f4225)
2022-05-23 10:29:54 +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
chengzrz
a4d63e64aa udpate lxc.spec to fix dependecies issues
(cherry picked from commit 433bebd5d5452d40bd2751471f6cea31394084b3)
2021-09-27 10:29:10 +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
zhangxiaoyu
2fa9b42e42 lxc: fix data overflow
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
(cherry picked from commit 02cf571f173193d2ae5f7aa46a0116e0abf142f4)
2021-06-01 16:47:07 +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
WangFengTu
efbec32f71 support isula exec --workdir
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
(cherry picked from commit caf56e2dec5a5901a246753d5f0196743b3f8219)
2021-03-31 14:44:52 +08:00
WangFengTu
65ddc895b9 support cgroup v2
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
(cherry picked from commit 80162dc0144a5a969483ccda008886171cecac9f)
2021-03-31 10:59:11 +08:00