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

Merge pull request #2679 from dgageot/fix-coreos-google 

Fix for coreos provisionning with google driver
This commit is contained in:
David Gageot 2015-12-24 11:11:35 +01:00
parent 1c0a05529f f4bfba96f1
commit 12bf80fb12
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmachine/provision/utils.go
View File

@ -115,7 +115,7 @@ func ConfigureAuth(p Provisioner) error {
return err
}
if _, err := p.SSHCommand("sudo ip link delete docker0"); err != nil {
if _, err := p.SSHCommand(`if [ ! -z "$(ip link show docker0)" ]; then sudo ip link delete docker0; fi`); err != nil {
return err
}