From b6028b0ba19fe830b7765a6900a52ef7122425d3 Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Wed, 18 Apr 2018 05:58:27 +0000 Subject: [PATCH] Move debug.{trace,debugger}_on_panic and kern.panic_reboot_wait_time in EC2 instances from sysctl.conf to loader.conf; these can all be set as loader tunables, and setting them in loader.conf gives us the right behaviour in the event of a kernel panic taking place prior to when sysctl.conf is processed. MFC after: 1 week --- release/tools/ec2.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 8cfb3da97d85..0ef5a211df1e 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -60,9 +60,9 @@ vm_extra_pre_umount() { # The EC2 console is output-only, so while printing a backtrace can # be useful, there's no point dropping into a debugger or waiting # for a keypress. - echo 'debug.trace_on_panic=1' >> ${DESTDIR}/etc/sysctl.conf - echo 'debug.debugger_on_panic=0' >> ${DESTDIR}/etc/sysctl.conf - echo 'kern.panic_reboot_wait_time=0' >> ${DESTDIR}/etc/sysctl.conf + echo 'debug.trace_on_panic=1' >> ${DESTDIR}/boot/loader.conf + echo 'debug.debugger_on_panic=0' >> ${DESTDIR}/boot/loader.conf + echo 'kern.panic_reboot_wait_time=0' >> ${DESTDIR}/boot/loader.conf # The console is not interactive, so we might as well boot quickly. echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf