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

Merge pull request #2916 from dgageot/vbox-logs 

Add more logs, specially for windows users
This commit is contained in:
Jean-Laurent de Morlhon 2016-01-25 15:52:15 +01:00
parent 01f4ffd21f b6b99747bf
commit dd3b66e3b6
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/virtualbox/network.go
View File

@ -8,6 +8,8 @@ import (
"strings"
"time"
"runtime"
"github.com/docker/machine/libmachine/log"
)
@ -49,6 +51,10 @@ func (n *hostOnlyNetwork) Save(vbox VBoxManager) error {
// SaveIPv4 changes the ipv4 configuration of the host-only network.
func (n *hostOnlyNetwork) SaveIPv4(vbox VBoxManager) error {
if n.IPv4.IP != nil && n.IPv4.Mask != nil {
if runtime.GOOS == "windows" {
log.Warn("Windows might ask for the permission to configure a network adapter. Sometimes, such confirmation window is minimized in the taskbar.")
}
if err := vbox.vbm("hostonlyif", "ipconfig", n.Name, "--ip", n.IPv4.IP.String(), "--netmask", net.IP(n.IPv4.Mask).String()); err != nil {
return err
}
@ -59,6 +65,10 @@ func (n *hostOnlyNetwork) SaveIPv4(vbox VBoxManager) error {
// createHostonlyAdapter creates a new host-only network.
func createHostonlyAdapter(vbox VBoxManager) (*hostOnlyNetwork, error) {
if runtime.GOOS == "windows" {
log.Warn("Windows might ask for the permission to create a network adapter. Sometimes, such confirmation window is minimized in the taskbar.")
}
out, err := vbox.vbmOut("hostonlyif", "create")
if err != nil {
return nil, err
@ -226,6 +236,8 @@ func removeOrphanDHCPServers(vbox VBoxManager) error {
return nil
}
log.Debug("Removing orphan DHCP servers...")
nets, err := listHostOnlyAdapters(vbox)
if err != nil {
return err
@ -277,6 +289,10 @@ func addHostOnlyDHCPServer(ifname string, d dhcpServer, vbox VBoxManager) error
args = append(args, "--disable")
}
if runtime.GOOS == "windows" {
log.Warn("Windows might ask for the permission to configure a dhcp server. Sometimes, such confirmation window is minimized in the taskbar.")
}
return vbox.vbm(args...)
}

4
drivers/virtualbox/virtualbox.go
View File

@ -478,7 +478,8 @@ func (d *Driver) Start() error {
var hostOnlyAdapter *hostOnlyNetwork
if s == state.Stopped {
// check network to re-create if needed
log.Infof("Check network to re-create if needed...")
if hostOnlyAdapter, err = d.setupHostOnlyNetwork(d.MachineName); err != nil {
return fmt.Errorf("Error setting up host only network on machine start: %s", err)
}
@ -715,7 +716,6 @@ func (d *Driver) setupHostOnlyNetwork(machineName string) (*hostOnlyNetwork, err
return nil, err
}
log.Debug("Removing orphan DHCP servers...")
if err := removeOrphanDHCPServers(d.VBoxManager); err != nil {
return nil, err
}