Merge pull request moby#3515 from crosbymichael/no-host-name-without-…

…networking Do not add hostname when networking is disabled
umairmufti · Jan 9, 2014 · 42df36b · 42df36b
2 parents 189c405 + 0354c3a
commit 42df36b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/container.go b/container.go
@@ -1044,7 +1044,7 @@ ff02::2		ip6-allrouters
 
 	if container.Config.Domainname != "" {
 		hostsContent = append([]byte(fmt.Sprintf("%s\t%s.%s %s\n", IP, container.Config.Hostname, container.Config.Domainname, container.Config.Hostname)), hostsContent...)
-	} else {
+	} else if !container.Config.NetworkDisabled {
 		hostsContent = append([]byte(fmt.Sprintf("%s\t%s\n", IP, container.Config.Hostname)), hostsContent...)
 	}