From 58f18e3f60bc835d73ff566ccdfa3ad36b3b72a8 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 10 Sep 2018 10:13:43 +0200 Subject: tools/create-gce-image.sh: disable ftrace_dump_on_oops We don't have anything useful there. But sometimes fuzzer somehow poppulates it with some nonsense, and then it all dumped in crashes. Disable it. --- pkg/build/linux_generated.go | 2 +- tools/create-gce-image.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/build/linux_generated.go b/pkg/build/linux_generated.go index 28e9355e1..ac4f42a63 100644 --- a/pkg/build/linux_generated.go +++ b/pkg/build/linux_generated.go @@ -110,7 +110,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 nmi_watchdog=panic panic=86400 $CMDLINE + linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 $CMDLINE } EOF sudo grub-install --target=i386-pc --boot-directory=disk.mnt/boot --no-floppy $DISKDEV diff --git a/tools/create-gce-image.sh b/tools/create-gce-image.sh index ce880772e..b555b19b7 100755 --- a/tools/create-gce-image.sh +++ b/tools/create-gce-image.sh @@ -164,7 +164,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 nmi_watchdog=panic panic=86400 $CMDLINE + linux /vmlinuz root=/dev/sda1 console=ttyS0 earlyprintk=serial vsyscall=native rodata=n oops=panic panic_on_warn=1 nmi_watchdog=panic panic=86400 $CMDLINE } EOF sudo grub-install --target=i386-pc --boot-directory=disk.mnt/boot --no-floppy $DISKDEV -- cgit mrf-deployment