From cab342f0de2818564a84358d54fc599f2c45c44f Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Mon, 28 Sep 2015 11:02:37 -0400 Subject: [PATCH] Check for failure on /dev/mqueue and try again without labeling Signed-off-by: Dan Walsh --- libcontainer/rootfs_linux.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go index f13c9fbad..b801fafc8 100644 --- a/libcontainer/rootfs_linux.go +++ b/libcontainer/rootfs_linux.go @@ -113,7 +113,10 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error { return err } if err := mountPropagate(m, rootfs, mountLabel); err != nil { - return err + // older kernels do not support labeling of /dev/mqueue + if err := mountPropagate(m, rootfs, ""); err != nil { + return err + } } return label.SetFileLabel(dest, mountLabel) case "tmpfs":