github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-13 15:14:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7887 from jodh-intel/hypervisor-remove-debug-kernel-options

Browse Source 
runtime-rs: hypervisor: Remove debug kernel options
This commit is contained in:
James O. D. Hunt 2023-09-12 16:31:48 +01:00 committed by GitHub
commit 7feb8de9dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime-rs/Makefile
View File

@ -122,7 +122,7 @@ DEFMEMSZ := 2048
DEFMEMSLOTS := 10 DEFMEMSLOTS := 10
##VAR DEFBRIDGES=<number> Default number of bridges ##VAR DEFBRIDGES=<number> Default number of bridges
DEFBRIDGES := 0 DEFBRIDGES := 0
DEFENABLEANNOTATIONS := [] DEFENABLEANNOTATIONS := [\"kernel_params\"]
DEFDISABLEGUESTSECCOMP := true DEFDISABLEGUESTSECCOMP := true
DEFDISABLEGUESTEMPTYDIR := false DEFDISABLEGUESTEMPTYDIR := false
##VAR DEFAULTEXPFEATURES=[features] Default experimental features enabled ##VAR DEFAULTEXPFEATURES=[features] Default experimental features enabled

2
src/runtime-rs/crates/hypervisor/src/kernel_param.rs
View File

@ -56,8 +56,6 @@ impl KernelParams {
// default kernel params // default kernel params
let mut params = vec![ let mut params = vec![
Param::new("reboot", "k"), Param::new("reboot", "k"),
Param::new("earlyprintk", "ttyS0"),
Param::new("initcall_debug", ""),
Param::new("panic", "1"), Param::new("panic", "1"),
Param::new("systemd.unit", "kata-containers.target"), Param::new("systemd.unit", "kata-containers.target"),
Param::new("systemd.mask", "systemd-networkd.service"), Param::new("systemd.mask", "systemd-networkd.service"),

2
src/runtime/Makefile
View File

@ -194,7 +194,7 @@ DEFMEMSLOTS := 10
DEFMAXMEMSZ := 0 DEFMAXMEMSZ := 0
#Default number of bridges #Default number of bridges
DEFBRIDGES := 1 DEFBRIDGES := 1
DEFENABLEANNOTATIONS := [\"enable_iommu\", \"virtio_fs_extra_args\"] DEFENABLEANNOTATIONS := [\"enable_iommu\", \"virtio_fs_extra_args\", \"kernel_params\"]
DEFDISABLEGUESTSECCOMP := true DEFDISABLEGUESTSECCOMP := true
DEFDISABLEGUESTEMPTYDIR := false DEFDISABLEGUESTEMPTYDIR := false
#Default experimental features enabled #Default experimental features enabled

2
utils/kata-manager.sh
View File

@ -593,7 +593,7 @@ configure_kata()
sudo sed -i \ sudo sed -i \
-e 's/^# *\(enable_debug\).*=.*$/\1 = true/g' \ -e 's/^# *\(enable_debug\).*=.*$/\1 = true/g' \
-e 's/^kernel_params = "\(.*\)"/kernel_params = "\1 agent.log=debug initcall_debug"/g' \ -e 's/^kernel_params = "\(.*\)"/kernel_params = "\1 agent.log=debug"/g' \
"$cfg_to" "$cfg_to"
info "Configured $kata_project for full debug (delete $cfg_to to use pristine $kata_project configuration)" info "Configured $kata_project for full debug (delete $cfg_to to use pristine $kata_project configuration)"