github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-27 15:57:09 +00:00
Code Issues Projects Releases Wiki Activity

qemu: only set systemd related kernel parameters when needed

Browse Source 
When we use initrd based booting, there is no systemd to be configured.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
This commit is contained in:
Peng Tao 2018-03-22 16:24:30 +08:00
parent 38af66ca39
commit 8c5fb45f99
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/qemu_amd64.go
View File

@ -105,6 +105,8 @@ func newQemuArch(config HypervisorConfig) qemuArch {
if config.ImagePath != "" { if config.ImagePath != "" {
q.kernelParams = append(q.kernelParams, kernelRootParams...) q.kernelParams = append(q.kernelParams, kernelRootParams...)
q.kernelParamsNonDebug = append(q.kernelParamsNonDebug, kernelParamsSystemdNonDebug...)
q.kernelParamsDebug = append(q.kernelParamsDebug, kernelParamsSystemdDebug...)
} }
return q return q

11
virtcontainers/qemu_arch_base.go
View File

@ -136,6 +136,11 @@ const (
// parameters that will be used in standard (non-debug) mode. // parameters that will be used in standard (non-debug) mode.
var kernelParamsNonDebug = []Param{ var kernelParamsNonDebug = []Param{
{"quiet", ""}, {"quiet", ""},
}
// kernelParamsSystemdNonDebug is a list of the default systemd related
// kernel parameters that will be used in standard (non-debug) mode.
var kernelParamsSystemdNonDebug = []Param{
{"systemd.show_status", "false"}, {"systemd.show_status", "false"},
} }
@ -144,6 +149,12 @@ var kernelParamsNonDebug = []Param{
// possible). // possible).
var kernelParamsDebug = []Param{ var kernelParamsDebug = []Param{
{"debug", ""}, {"debug", ""},
}
// kernelParamsSystemdDebug is a list of the default systemd related kernel
// parameters that will be used in debug mode (as much boot output as
// possible).
var kernelParamsSystemdDebug = []Param{
{"systemd.show_status", "true"}, {"systemd.show_status", "true"},
{"systemd.log_level", "debug"}, {"systemd.log_level", "debug"},
} }

2
virtcontainers/qemu_arm64.go
View File

@ -77,6 +77,8 @@ func newQemuArch(config HypervisrConfig) qemuArch {
if config.ImagePath != "" { if config.ImagePath != "" {
q.kernelParams = append(q.kernelParams, kernelRootParams...) q.kernelParams = append(q.kernelParams, kernelRootParams...)
q.kernelParamsNonDebug = append(q.kernelParamsNonDebug, kernelParamsSystemdNonDebug...)
q.kernelParamsDebug = append(q.kernelParamsDebug, kernelParamsSystemdDebug...)
} }
return q return q