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

Fix some forgotten errors. 

Signed-off-by: Jeff Mendoza <jeffmendoza@live.com>
This commit is contained in:
Jeff Mendoza 2014-12-12 10:58:01 -08:00 committed by Evan Hazlett
parent edccb4a643
commit cd01ee76b6
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/hyperv/hyperv_windows.go
View File

@ -258,14 +258,20 @@ func (d *Driver) SetConfigFromFlags(flagsInterface interface{}) error {
func (d *Driver) wait() error { func (d *Driver) wait() error {
log.Infof("Waiting for host to start...") log.Infof("Waiting for host to start...")
for { for {
ip, _ := d.GetIP() ip, err := d.GetIP()
if err != nil {
return err
}
if ip != "" { if ip != "" {
break break
} }
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} }
log.Infof("Got IP, waiting for SSH") log.Infof("Got IP, waiting for SSH")
ip, _ := d.GetIP() ip, err := d.GetIP()
if err != nil {
return err
}
return ssh.WaitForTCP(fmt.Sprintf("%s:22", ip)) return ssh.WaitForTCP(fmt.Sprintf("%s:22", ip))
} }
@ -376,7 +382,10 @@ func (d *Driver) GetIP() (string, error) {
} }
func (d *Driver) GetSSHCommand(args ...string) (*exec.Cmd, error) { func (d *Driver) GetSSHCommand(args ...string) (*exec.Cmd, error) {
ip, _ := d.GetIP() ip, err := d.GetIP()
if err != nil {
return "", err
}
return ssh.GetSSHCommand(ip, 22, "docker", d.sshKeyPath(), args...), nil return ssh.GetSSHCommand(ip, 22, "docker", d.sshKeyPath(), args...), nil
} }
@ -488,7 +497,10 @@ func (d *Driver) generateDiskImage() error {
return err return err
} }
file, _ := os.OpenFile(fixed, os.O_WRONLY, 0644) file, err := os.OpenFile(fixed, os.O_WRONLY, 0644)
if err != nil {
return err
}
defer file.Close() defer file.Close()
file.Seek(0, os.SEEK_SET) file.Seek(0, os.SEEK_SET)
_, err = file.Write(tarBuf.Bytes()) _, err = file.Write(tarBuf.Bytes())