Skip to content

Commit

Permalink
Merge pull request docker#2679 from dgageot/fix-coreos-google
Browse files Browse the repository at this point in the history
Fix for coreos provisionning with google driver
  • Loading branch information
dgageot committed Dec 24, 2015
2 parents 1c0a055 + f4bfba9 commit 12bf80f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion libmachine/provision/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 12bf80f

Please sign in to comment.