Browse Source

Merge pull request #21816 from estesp/case-of-the-missing-else

Don't perform external setkey when net==host
Sebastiaan van Stijn 9 years ago
parent
commit
fc352287c1
1 changed files with 4 additions and 3 deletions
  1. 4 3
      daemon/container_operations.go

+ 4 - 3
daemon/container_operations.go

@@ -48,10 +48,11 @@ func (daemon *Daemon) buildSandboxOptions(container *container.Container, n libn
 		sboxOptions = append(sboxOptions, libnetwork.OptionUseDefaultSandbox())
 		sboxOptions = append(sboxOptions, libnetwork.OptionUseDefaultSandbox())
 		sboxOptions = append(sboxOptions, libnetwork.OptionOriginHostsPath("/etc/hosts"))
 		sboxOptions = append(sboxOptions, libnetwork.OptionOriginHostsPath("/etc/hosts"))
 		sboxOptions = append(sboxOptions, libnetwork.OptionOriginResolvConfPath("/etc/resolv.conf"))
 		sboxOptions = append(sboxOptions, libnetwork.OptionOriginResolvConfPath("/etc/resolv.conf"))
+	} else {
+		// OptionUseExternalKey is mandatory for userns support.
+		// But optional for non-userns support
+		sboxOptions = append(sboxOptions, libnetwork.OptionUseExternalKey())
 	}
 	}
-	// OptionUseExternalKey is mandatory for userns support.
-	// But optional for non-userns support
-	sboxOptions = append(sboxOptions, libnetwork.OptionUseExternalKey())
 
 
 	container.HostsPath, err = container.GetRootResourcePath("hosts")
 	container.HostsPath, err = container.GetRootResourcePath("hosts")
 	if err != nil {
 	if err != nil {