proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 04:09:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

conf: ensure umounts don't propagate to host

Browse Source 
Signed-off-by: Fengtu Wang <wangfengtu@huawei.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Fengtu Wang 2018-04-03 05:00:19 +08:00 committed by Christian Brauner
parent 0474e8a8e5
commit e599717bc5
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lxc/conf.c
View File

@ -1112,7 +1112,7 @@ static int setup_rootfs_pivot_root(const char *rootfs)
goto on_error; goto on_error;
} }
/* At this point the old-root is mounted on top of our new-root To /* At this point the old-root is mounted on top of our new-root. To
* unmounted it we must not be chdir'd into it, so escape back to * unmounted it we must not be chdir'd into it, so escape back to
* old-root. * old-root.
*/ */
@ -1122,6 +1122,15 @@ static int setup_rootfs_pivot_root(const char *rootfs)
goto on_error; goto on_error;
} }
/* Make oldroot rslave to make sure our umounts don't propagate to the
* host.
*/
ret = mount("", ".", "", MS_SLAVE | MS_REC, NULL);
if (ret < 0) {
SYSERROR("Failed to make oldroot rslave");
goto on_error;
}
ret = umount2(".", MNT_DETACH); ret = umount2(".", MNT_DETACH);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to detach old root directory"); SYSERROR("Failed to detach old root directory");