Explorar o código

Merge pull request #5565 from creack/fix_devpts

Month devpts before mounting subdirs
Michael Crosby %!s(int64=11) %!d(string=hai) anos
pai
achega
ac7b2b888d
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      pkg/libcontainer/mount/init.go

+ 1 - 1
pkg/libcontainer/mount/init.go

@@ -128,7 +128,7 @@ func newSystemMounts(rootfs, mountLabel string, mounts libcontainer.Mounts) []mo
 	}
 
 	if len(mounts.OfType("devtmpfs")) == 1 {
-		systemMounts = append(systemMounts, mount{source: "tmpfs", path: filepath.Join(rootfs, "dev"), device: "tmpfs", flags: syscall.MS_NOSUID | syscall.MS_STRICTATIME, data: label.FormatMountLabel("mode=755", mountLabel)})
+		systemMounts = append([]mount{{source: "tmpfs", path: filepath.Join(rootfs, "dev"), device: "tmpfs", flags: syscall.MS_NOSUID | syscall.MS_STRICTATIME, data: label.FormatMountLabel("mode=755", mountLabel)}}, systemMounts...)
 	}
 	return systemMounts
 }