Browse Source

Merge pull request #36991 from kolyshkin/slice-in-place

daemon.setMounts(): copy slice in place
Sebastiaan van Stijn 7 years ago
parent
commit
31aca4bef4
1 changed files with 1 additions and 1 deletions
  1. 1 1
      daemon/oci_linux.go

+ 1 - 1
daemon/oci_linux.go

@@ -527,7 +527,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c
 	//  - /dev/shm, in case IpcMode is none.
 	//  - /dev/shm, in case IpcMode is none.
 	// While at it, also
 	// While at it, also
 	//  - set size for /dev/shm from shmsize.
 	//  - set size for /dev/shm from shmsize.
-	var defaultMounts []specs.Mount
+	defaultMounts := s.Mounts[:0]
 	_, mountDev := userMounts["/dev"]
 	_, mountDev := userMounts["/dev"]
 	for _, m := range s.Mounts {
 	for _, m := range s.Mounts {
 		if _, ok := userMounts[m.Destination]; ok {
 		if _, ok := userMounts[m.Destination]; ok {