iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6807 from dev-rowbot/qemu-net-device-6804 

Fix for #6804 - KVM/QEMU Network "has no peer"
This commit is contained in:
Megan Marsh 2018-10-18 14:09:22 -07:00 committed by GitHub
parent c5b6eff691 65db6be6b9
commit 3175dcdf81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builder/qemu/step_run.go
View File

@ -217,6 +217,13 @@ func getCommandArgs(bootDrive string, state multistep.StateBag) ([]string, error
} }
} }
// Check if we are missing the netDevice #6804
if x, ok := inArgs["-device"]; ok {
if !strings.Contains(strings.Join(x, ""), config.NetDevice) {
inArgs["-device"] = append(inArgs["-device"], fmt.Sprintf("%s,netdev=user.0", config.NetDevice))
}
}
// Flatten to array of strings // Flatten to array of strings
outArgs := make([]string, 0) outArgs := make([]string, 0)
for key, values := range inArgs { for key, values := range inArgs {