docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11111 from zenlinTechnofreak/zlFixDriverNote 

fix err in note at daemon/networkdriver/bridge/driver.go
This commit is contained in:
moxiegirl 2015-03-02 12:31:37 -08:00
parent 2bfa701f45 e5bc50b5cd
commit 377e62aa02
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/networkdriver/bridge/driver.go
View File

@ -113,7 +113,7 @@ func InitDriver(job *engine.Job) engine.Status {
addrv4, addrsv6, err := networkdriver.GetIfaceAddr(bridgeIface) addrv4, addrsv6, err := networkdriver.GetIfaceAddr(bridgeIface)
if err != nil { if err != nil {
// No Bridge existent. Create one // No Bridge existent, create one
// If we're not using the default bridge, fail without trying to create it // If we're not using the default bridge, fail without trying to create it
if !usingDefaultBridge { if !usingDefaultBridge {
return job.Error(err) return job.Error(err)
@ -137,7 +137,7 @@ func InitDriver(job *engine.Job) engine.Status {
} }
} }
} else { } else {
// Bridge exists already. Getting info... // Bridge exists already, getting info...
// validate that the bridge ip matches the ip specified by BridgeIP // validate that the bridge ip matches the ip specified by BridgeIP
if bridgeIP != "" { if bridgeIP != "" {
networkv4 = addrv4.(*net.IPNet) networkv4 = addrv4.(*net.IPNet)