From 72855a7c5d57ba89b8d5088dda0721c4d87d3a1b Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Fri, 29 Apr 2016 12:23:56 +0000
Subject: [PATCH] Add a savecore_enable variable support for the savecore rc
 script

By default set to 'YES' so it does not change the current behaviour for users,
this variable allows to decide to not extract crach dumps from the dump
device at boot time by setting it to "NO" in rc.conf.

Sponsored by:	Gandi.net
---
 etc/defaults/rc.conf     | 1 +
 etc/rc.d/savecore        | 1 +
 share/man/man5/rc.conf.5 | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 0959c18affcb..a48bcea18453 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -603,6 +603,7 @@ chkprintcap_enable="NO"	# Run chkprintcap(8) before running lpd.
 chkprintcap_flags="-d"	# Create missing directories by default.
 dumpdev="AUTO"		# Device to crashdump to (device name, AUTO, or NO).
 dumpdir="/var/crash"	# Directory where crash dumps are to be stored
+savecore_enable="YES"	# Extract core from dump devices if any
 savecore_flags="-m 10"	# Used if dumpdev is enabled above, and present.
 			# By default, only the 10 most recent kernel dumps
 			# are saved.
diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index 56a34ff4233a..bfc61bce3c7e 100755
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@@ -10,6 +10,7 @@
 . /etc/rc.subr
 
 name="savecore"
+rcvar="savecore_enable"
 desc="Save a core dump of the operating system"
 start_cmd="savecore_start"
 start_precmd="savecore_prestart"
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 6025db4853ed..9d393b0e33ad 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 28, 2016
+.Dd April 29, 2016
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -3511,6 +3511,12 @@ to not run
 at boot time when
 .Va dumpdir
 is set.
+.It Va savecore_enable
+.Pq Vt bool
+If set to
+.Dq Li NO ,
+disable automatic extraction of the crash dump from the
+.Va dumpdev .
 .It Va savecore_flags
 .Pq Vt str
 If crash dumps are enabled, these are the flags to pass to the