rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-16 15:09:27 +00:00
Code Issues Releases Wiki Activity

Preserve custom kernel arguments when upgrading

Browse Source
This commit is contained in:
Josh Curl
2016-09-26 17:27:53 -07:00
parent bdf266e655
commit 1731fc5642
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/control/os.go
View File

@@ -58,7 +58,7 @@ func osSubcommands() []cli.Command {
},
cli.StringFlag{
Name: "append",
Usage: "kernel args to append by kexec",
Usage: "append additional kernel parameters",
},
cli.BoolFlag{
Name: "upgrade-console",
@@ -187,11 +187,11 @@ func startUpgradeContainer(image string, stage, force, reboot, kexec bool, upgra
if kexec {
command = append(command, "-k")
}
kernelArgs = strings.TrimSpace(kernelArgs)
if kernelArgs != "" {
command = append(command, "-a", kernelArgs)
}
kernelArgs = strings.TrimSpace(kernelArgs)
if kernelArgs != "" {
command = append(command, "-a", kernelArgs)
}
if upgradeConsole {