Skip to content

Commit e5f2eae

Browse files
authored
Merge pull request #2558 from rhatdan/windows
Since no kernels support direct labeling of /dev/mqueue remove label
2 parents 19b63de + 0445fd6 commit e5f2eae

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
@@ -333,14 +333,10 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string, enableCgroupns b
333333
if err := os.MkdirAll(dest, 0755); err != nil {
334334
return err
335335
}
336-
if err := mountPropagate(m, rootfs, mountLabel); err != nil {
337-
// older kernels do not support labeling of /dev/mqueue
338-
if err := mountPropagate(m, rootfs, ""); err != nil {
339-
return err
340-
}
341-
return label.SetFileLabel(dest, mountLabel)
336+
if err := mountPropagate(m, rootfs, ""); err != nil {
337+
return err
342338
}
343-
return nil
339+
return label.SetFileLabel(dest, mountLabel)
344340
case "tmpfs":
345341
copyUp := m.Extensions&configs.EXT_COPYUP == configs.EXT_COPYUP
346342
tmpDir := ""

0 commit comments

Comments
 (0)