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

!10 sync with openeuler on 03.11

Browse Source 
Merge pull request !10 from Grooooot/0311
This commit is contained in:
openeuler-ci-bot 2020-03-11 10:33:25 +08:00 committed by Gitee
commit 3c589e93a9
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/conf.c
View File

@ -1011,6 +1011,17 @@ bool is_system_container(const oci_runtime_spec *container)
return false; return false;
} }
static bool is_external_rootfs(const oci_runtime_spec *container)
{
size_t i = 0;
for (i = 0; container->annotations != NULL && i < container->annotations->len; i++) {
if (strcmp(container->annotations->keys[i], "external.rootfs") == 0) {
return true;
}
}
return false;
}
static struct lcr_list *trans_oci_mounts_normal(const defs_mount *tmp) static struct lcr_list *trans_oci_mounts_normal(const defs_mount *tmp)
{ {
struct lcr_list *node = NULL; struct lcr_list *node = NULL;
@ -1054,9 +1065,9 @@ static inline bool is_mount_destination_dev(const char *destination)
return destination != NULL && strcmp(destination, "/dev") == 0; return destination != NULL && strcmp(destination, "/dev") == 0;
} }
static inline bool should_ignore_dev_mount(const defs_mount *tmp, bool system_container) static inline bool should_ignore_dev_mount(const defs_mount *tmp, bool system_container, bool external_rootfs)
{ {
return system_container && is_mount_destination_dev(tmp->destination); return system_container && external_rootfs && is_mount_destination_dev(tmp->destination);
} }
/* trans oci mounts */ /* trans oci mounts */
@ -1067,6 +1078,7 @@ struct lcr_list *trans_oci_mounts(const oci_runtime_spec *c)
defs_mount *tmp = NULL; defs_mount *tmp = NULL;
size_t i; size_t i;
bool system_container = is_system_container(c); bool system_container = is_system_container(c);
bool external_rootfs = is_external_rootfs(c);
conf = util_common_calloc_s(sizeof(*conf)); conf = util_common_calloc_s(sizeof(*conf));
if (conf == NULL) { if (conf == NULL) {
@ -1080,7 +1092,7 @@ struct lcr_list *trans_oci_mounts(const oci_runtime_spec *c)
goto out_free; goto out_free;
} }
if (should_ignore_dev_mount(tmp, system_container)) { if (should_ignore_dev_mount(tmp, system_container, external_rootfs)) {
continue; continue;
} }
node = trans_oci_mounts_node(c, tmp); node = trans_oci_mounts_node(c, tmp);