提交 62e3ba7b 编写于 作者: A Anders F Björklund

Update docker/machine to fix the AMD bug

上级 79c1e7d9
......@@ -69,7 +69,7 @@
[[projects]]
branch = "master"
digest = "1:47b479ee07f66c92682bcf27e3a65b411b7ba52bfc28fd0b6b74a742620fc61a"
digest = "1:d4104968fb55cff5276444ffcf4693fa03deadc7cd98ed15005bf55e26a2ded1"
name = "github.com/docker/machine"
packages = [
"commands/mcndirs",
......@@ -106,7 +106,7 @@
"version",
]
pruneopts = "NUT"
revision = "a773edc6f013c9fab13360fea0192fd335023a16"
revision = "533ea58a3e7efb4b2b6cc24bb0b7b565e64d6b0e"
source = "github.com/machine-drivers/machine"
[[projects]]
......
......@@ -273,7 +273,7 @@ func (d *Driver) Create() error {
func (d *Driver) chooseVirtualSwitch() (string, error) {
if d.VSwitch == "" {
// Default to the first external switche and in the process avoid DockerNAT
stdout, err := cmdOut("(Hyper-V\\Get-VMSwitch -SwitchType External).Name")
stdout, err := cmdOut("[Console]::OutputEncoding = [Text.Encoding]::UTF8; (Hyper-V\\Get-VMSwitch -SwitchType External).Name")
if err != nil {
return "", err
}
......@@ -287,7 +287,7 @@ func (d *Driver) chooseVirtualSwitch() (string, error) {
return switches[0], nil
}
stdout, err := cmdOut("(Hyper-V\\Get-VMSwitch).Name")
stdout, err := cmdOut("[Console]::OutputEncoding = [Text.Encoding]::UTF8; (Hyper-V\\Get-VMSwitch).Name")
if err != nil {
return "", err
}
......
......@@ -6,7 +6,7 @@ import "github.com/intel-go/cpuid"
// IsVTXDisabled checks if VT-x is disabled in the CPU.
func (d *Driver) IsVTXDisabled() bool {
if cpuid.HasFeature(cpuid.VMX) || cpuid.HasFeature(cpuid.SVM) {
if cpuid.HasFeature(cpuid.VMX) || cpuid.HasExtraFeature(cpuid.SVM) {
return false
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册