aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/kernel/generated.go
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2017-06-15 18:28:49 +0200
committerDmitry Vyukov <dvyukov@google.com>2017-06-15 18:29:47 +0200
commit4c571f841345b0b720b330809c69b18d975b2332 (patch)
treedb00e112fa9fffde3b4c3c7f7b2652dea2ebfb0c /pkg/kernel/generated.go
parent429ff326c30b442d8c609ed7ddd0fbb5ba174a36 (diff)
pkg/kernel: add an option to provide full config for build
Normally config is applied on top of defconfig+kvmconfig. This allows to provide full config that is used unmodified.
Diffstat (limited to 'pkg/kernel/generated.go')
-rw-r--r--pkg/kernel/generated.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/kernel/generated.go b/pkg/kernel/generated.go
index 08d08e474..0e6ba5b89 100644
--- a/pkg/kernel/generated.go
+++ b/pkg/kernel/generated.go
@@ -68,7 +68,7 @@ menuentry 'linux' --class gnu-linux --class gnu --class os {
insmod part_msdos
insmod ext2
set root='(hd0,1)'
- linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n ftrace_dump_on_oops=orig_cpu oops=panic panic_on_warn=1 panic=86400 kvm-intel.nested=1 kvm-intel.unrestricted_guest=1 kvm-intel.vmm_exclusive=1 kvm-intel.fasteoi=1 kvm-intel.ept=1 kvm-intel.flexpriority=1 kvm-intel.vpid=1 kvm-intel.emulate_invalid_guest_state=1 kvm-intel.eptad=1 kvm-intel.enable_shadow_vmcs=1 kvm-intel.pml=1 kvm-intel.enable_apicv=1
+ linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n ftrace_dump_on_oops=orig_cpu oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 kvm-intel.nested=1 kvm-intel.unrestricted_guest=1 kvm-intel.vmm_exclusive=1 kvm-intel.fasteoi=1 kvm-intel.ept=1 kvm-intel.flexpriority=1 kvm-intel.vpid=1 kvm-intel.emulate_invalid_guest_state=1 kvm-intel.eptad=1 kvm-intel.enable_shadow_vmcs=1 kvm-intel.pml=1 kvm-intel.enable_apicv=1
}
EOF
sudo grub-install --boot-directory=disk.mnt/boot --no-floppy /dev/nbd0