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

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>

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

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index afb1f9b79f36d848e0b53a58283cfd7aa37deeed..a9afa2e665d96a3e37eff15af4fe05130b34c586 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -1288,7 +1288,7 @@ virProcessSetupPrivateMountNS(void)
 
     if (mount("", "/", "none", MS_SLAVE|MS_REC, NULL) < 0) {
         virReportSystemError(errno, "%s",
-                             _("Failed to switch root mount into slave mode"));
+                             _("Failed disable mount propagation out of the root filesystem"));
         return -1;
     }