p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3210 from rsampaio/fix_bridge_creation_3141

Browse Source 
Bridge creation when ipv6 is not enabled
Upstream-commit: bf916365589aa907c6ce486d5cae66f7a4da1419
Component: engine
This commit is contained in:
Michael Crosby
2013-12-13 12:03:55 -08:00
parent 52621c8ff3 c85e5831b2
commit e2926099e1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/network.go
View File

@ -178,7 +178,11 @@ func CreateBridgeIface(config *DaemonConfig) error {
func createBridgeIface(name string) error {
s, err := syscall.Socket(syscall.AF_INET6, syscall.SOCK_STREAM, syscall.IPPROTO_IP)
if err != nil {
return fmt.Errorf("Error creating bridge creation socket: %s", err)
utils.Debugf("Bridge socket creation failed IPv6 probably not enabled: %v", err)
s, err = syscall.Socket(syscall.AF_INET, syscall.SOCK_STREAM, syscall.IPPROTO_IP)
if err != nil {
return fmt.Errorf("Error creating bridge creation socket: %s", err)
}
}
defer syscall.Close(s)