Commit 7d8f1c01 authored by Megan Marsh's avatar Megan Marsh Committed by Sylvia Moss
Browse files

Revert "fix: persist default drive/device" (#8440)

This reverts commit 30ccab47 which introduced the issue 8436. 
parent fcda07ee
Showing with 7 additions and 4 deletions
+7 -4
......@@ -266,10 +266,13 @@ func getCommandArgs(bootDrive string, state multistep.StateBag) ([]string, error
arg = defaultArgs[key].([]string)
}
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))
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment