Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
209ada69
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
209ada69
编写于
3月 07, 2020
作者:
Z
zhangsong34
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
iSulad: support syscontainer without external rootfs
Signed-off-by:
N
zhangsong34
<
zhangsong34@huawei.com
>
上级
eefff013
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
4 deletion
+15
-4
src/services/execution/execute/execution.c
src/services/execution/execute/execution.c
+2
-2
src/services/execution/execute/execution_create.c
src/services/execution/execute/execution_create.c
+13
-2
未找到文件。
src/services/execution/execute/execution.c
浏览文件 @
209ada69
...
@@ -248,7 +248,7 @@ static int send_signal_to_process(pid_t pid, unsigned long long start_time, uint
...
@@ -248,7 +248,7 @@ static int send_signal_to_process(pid_t pid, unsigned long long start_time, uint
static
int
umount_dev_tmpfs_for_system_container
(
const
container_t
*
cont
)
static
int
umount_dev_tmpfs_for_system_container
(
const
container_t
*
cont
)
{
{
if
(
cont
->
hostconfig
!=
NULL
&&
cont
->
hostconfig
->
system_container
)
{
if
(
cont
->
hostconfig
!=
NULL
&&
cont
->
hostconfig
->
system_container
&&
cont
->
hostconfig
->
external_rootfs
!=
NULL
)
{
char
rootfs_dev_path
[
PATH_MAX
]
=
{
0
};
char
rootfs_dev_path
[
PATH_MAX
]
=
{
0
};
int
nret
=
snprintf
(
rootfs_dev_path
,
sizeof
(
rootfs_dev_path
),
"%s/dev"
,
cont
->
common_config
->
base_fs
);
int
nret
=
snprintf
(
rootfs_dev_path
,
sizeof
(
rootfs_dev_path
),
"%s/dev"
,
cont
->
common_config
->
base_fs
);
if
((
size_t
)
nret
>=
sizeof
(
rootfs_dev_path
)
||
nret
<
0
)
{
if
((
size_t
)
nret
>=
sizeof
(
rootfs_dev_path
)
||
nret
<
0
)
{
...
@@ -514,7 +514,7 @@ static int mount_dev_tmpfs_for_system_container(const container_t *cont)
...
@@ -514,7 +514,7 @@ static int mount_dev_tmpfs_for_system_container(const container_t *cont)
if
(
cont
==
NULL
||
cont
->
hostconfig
==
NULL
||
cont
->
common_config
==
NULL
)
{
if
(
cont
==
NULL
||
cont
->
hostconfig
==
NULL
||
cont
->
common_config
==
NULL
)
{
return
0
;
return
0
;
}
}
if
(
!
cont
->
hostconfig
->
system_container
)
{
if
(
!
cont
->
hostconfig
->
system_container
||
cont
->
hostconfig
->
external_rootfs
==
NULL
)
{
return
0
;
return
0
;
}
}
int
nret
=
snprintf
(
rootfs_dev_path
,
sizeof
(
rootfs_dev_path
),
"%s/dev"
,
cont
->
common_config
->
base_fs
);
int
nret
=
snprintf
(
rootfs_dev_path
,
sizeof
(
rootfs_dev_path
),
"%s/dev"
,
cont
->
common_config
->
base_fs
);
...
...
src/services/execution/execute/execution_create.c
浏览文件 @
209ada69
...
@@ -285,12 +285,23 @@ static int merge_config_for_syscontainer(const container_create_request *request
...
@@ -285,12 +285,23 @@ static int merge_config_for_syscontainer(const container_create_request *request
const
container_config
*
container_spec
,
const
oci_runtime_spec
*
oci_spec
)
const
container_config
*
container_spec
,
const
oci_runtime_spec
*
oci_spec
)
{
{
int
ret
=
0
;
int
ret
=
0
;
char
*
value
=
NULL
;
if
(
!
host_spec
->
system_container
||
request
->
rootfs
==
NULL
)
{
if
(
!
host_spec
->
system_container
)
{
return
0
;
return
0
;
}
}
if
(
request
->
rootfs
==
NULL
)
{
value
=
oci_spec
->
root
->
path
;
}
else
{
value
=
request
->
rootfs
;
}
if
(
append_json_map_string_string
(
oci_spec
->
annotations
,
"rootfs.mount"
,
request
->
rootfs
))
{
if
(
append_json_map_string_string
(
oci_spec
->
annotations
,
"rootfs.mount"
,
value
))
{
ERROR
(
"Realloc annotations failed"
);
ret
=
-
1
;
goto
out
;
}
if
(
request
->
rootfs
!=
NULL
&&
append_json_map_string_string
(
oci_spec
->
annotations
,
"external.rootfs"
,
"true"
))
{
ERROR
(
"Realloc annotations failed"
);
ERROR
(
"Realloc annotations failed"
);
ret
=
-
1
;
ret
=
-
1
;
goto
out
;
goto
out
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录