NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

lxc: replace use of term 'slave' filesystem mount setup

Browse Source 
Refer to the notion of mount propagation instead which describes
the actual behaviour more clearly.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-06-17 11:57:31 +01:00
parent 764d07838c
commit d73cd87e81
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/lxc_controller.c
View File

@ -2116,9 +2116,9 @@ virLXCControllerSetupPrivateNS(void)
* *
* Thus we call unshare(CLONE_NS) so that we can see * Thus we call unshare(CLONE_NS) so that we can see
* the guest's new /dev/pts, without it becoming * the guest's new /dev/pts, without it becoming
* visible to the host OS. We also put the root FS * visible to the host OS. We also disable mount
* into slave mode, just in case it was currently * propagation out of the root FS, in case it was
* marked as shared * currently allowing bi-directional propagation.
*/ */
return virProcessSetupPrivateMountNS(); return virProcessSetupPrivateMountNS();

2
src/util/virprocess.c
View File

@ -1288,7 +1288,7 @@ virProcessSetupPrivateMountNS(void)
if (mount("", "/", "none", MS_SLAVE|MS_REC, NULL) < 0) { if (mount("", "/", "none", MS_SLAVE|MS_REC, NULL) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("Failed to switch root mount into slave mode")); _("Failed disable mount propagation out of the root filesystem"));
return -1; return -1;
} }