svn commit: r332982 - stable/11/release/tools

[Colin Percival]

Author: cperciva
Date: Wed Apr 25 01:54:24 2018
New Revision: 332982
URL: https://svnweb.freebsd.org/changeset/base/332982

Log:
  MFC r332663: Move panic-related settings from sysctl.conf to loader.conf so
  that they apply if an EC2 instance panics while booting.
  
  Sponsored by:	https://www.patreon.com/cperciva

Modified:
  stable/11/release/tools/ec2.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/release/tools/ec2.conf
==============================================================================
--- stable/11/release/tools/ec2.conf	Wed Apr 25 01:48:15 2018	(r332981)
+++ stable/11/release/tools/ec2.conf	Wed Apr 25 01:54:24 2018	(r332982)
@@ -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