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

fix: persist default drive/device

This commit is contained in:
bugbuilder 2019-11-17 04:38:30 -03:00
parent 261331ee2d
commit 30ccab472f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builder/qemu/step_run.go
View File

@ -266,13 +266,10 @@ func getCommandArgs(bootDrive string, state multistep.StateBag) ([]string, error
arg = defaultArgs[key].([]string) arg = defaultArgs[key].([]string)
} }
inArgs[key] = arg inArgs[key] = arg
} } else {
} if key == "-device" || key == "-drive" {
inArgs[key] = append(defaultArgs[key].([]string), inArgs[key]...)
// 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))
} }
} }