Skip to content

Commit 0445fd6

Browse files
committed
Since no kernels support direct labeling of /dev/mqueue remove label
This looks like this is just filling logs for years, since the kernel never added the support for automatically labeling /dev/mqueue. Removes these dmesg lines [ 1731.969847] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1736.985146] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1738.356796] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1738.479952] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1738.628935] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1763.433276] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1806.802133] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1806.982003] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1808.955390] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1815.951076] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1827.257757] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1828.947888] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1834.964451] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) [ 1835.941465] SELinux: mount invalid. Same superblock, different security settings for (dev mqueue, type mqueue) Signed-off-by: Daniel J Walsh <[email protected]>
1 parent e949339 commit 0445fd6

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

libcontainer/rootfs_linux.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -329,14 +329,10 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string, enableCgroupns b
329329
if err := os.MkdirAll(dest, 0755); err != nil {
330330
return err
331331
}
332-
if err := mountPropagate(m, rootfs, mountLabel); err != nil {
333-
// older kernels do not support labeling of /dev/mqueue
334-
if err := mountPropagate(m, rootfs, ""); err != nil {
335-
return err
336-
}
337-
return label.SetFileLabel(dest, mountLabel)
332+
if err := mountPropagate(m, rootfs, ""); err != nil {
333+
return err
338334
}
339-
return nil
335+
return label.SetFileLabel(dest, mountLabel)
340336
case "tmpfs":
341337
copyUp := m.Extensions&configs.EXT_COPYUP == configs.EXT_COPYUP
342338
tmpDir := ""

0 commit comments

Comments
 (0)