svn commit: r332663 - head/release/tools

[Colin Percival]

Author: cperciva
Date: Wed Apr 18 05:58:27 2018
New Revision: 332663
URL: https://svnweb.freebsd.org/changeset/base/332663

Log:
  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

Modified:
  head/release/tools/ec2.conf

Modified: head/release/tools/ec2.conf
==============================================================================
--- head/release/tools/ec2.conf	Wed Apr 18 02:25:03 2018	(r332662)
+++ head/release/tools/ec2.conf	Wed Apr 18 05:58:27 2018	(r332663)
@@ -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