proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 08:12:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

conf: make tmp_umount_proc bool

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-05-29 00:54:16 +02:00
parent 5173b71073
commit 7a0bcca310
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lxc/conf.c
View File

@ -2676,7 +2676,7 @@ struct lxc_conf *lxc_conf_init(void)
lxc_list_init(&new->state_clients); lxc_list_init(&new->state_clients);
new->lsm_aa_profile = NULL; new->lsm_aa_profile = NULL;
new->lsm_se_context = NULL; new->lsm_se_context = NULL;
new->tmp_umount_proc = 0; new->tmp_umount_proc = false;
/* if running in a new user namespace, init and COMMAND /* if running in a new user namespace, init and COMMAND
* default to running as UID/GID 0 when using lxc-execute */ * default to running as UID/GID 0 when using lxc-execute */
@ -3158,7 +3158,7 @@ int lxc_create_tmp_proc_mount(struct lxc_conf *conf)
if (conf->rootfs.path) if (conf->rootfs.path)
return -1; return -1;
} else if (mounted == 1) { } else if (mounted == 1) {
conf->tmp_umount_proc = 1; conf->tmp_umount_proc = true;
} }
return 0; return 0;
@ -3166,11 +3166,11 @@ int lxc_create_tmp_proc_mount(struct lxc_conf *conf)
void tmp_proc_unmount(struct lxc_conf *lxc_conf) void tmp_proc_unmount(struct lxc_conf *lxc_conf)
{ {
if (lxc_conf->tmp_umount_proc != 1) if (!lxc_conf->tmp_umount_proc)
return; return;
umount("/proc"); (void)umount2("/proc", MNT_DETACH);
lxc_conf->tmp_umount_proc = 0; lxc_conf->tmp_umount_proc = false;
} }
/* Walk /proc/mounts and change any shared entries to slave. */ /* Walk /proc/mounts and change any shared entries to slave. */

2
src/lxc/conf.h
View File

@ -271,7 +271,7 @@ struct lxc_conf {
char *lsm_aa_profile; char *lsm_aa_profile;
unsigned int lsm_aa_allow_incomplete; unsigned int lsm_aa_allow_incomplete;
char *lsm_se_context; char *lsm_se_context;
int tmp_umount_proc; bool tmp_umount_proc;
char *seccomp; /* filename with the seccomp rules */ char *seccomp; /* filename with the seccomp rules */
#if HAVE_SCMP_FILTER_CTX #if HAVE_SCMP_FILTER_CTX
scmp_filter_ctx seccomp_ctx; scmp_filter_ctx seccomp_ctx;