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

Fix for #6804 

The user QEMU args may overwrite the default -device.
This results in no network
This commit is contained in:
Rowan Potgieter 2018-10-06 14:40:43 +02:00
parent b5ade5d49e
commit 65db6be6b9
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 {