From owner-svn-soc-all@freebsd.org  Mon Nov 30 21:19:18 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D42BA3DA8E
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 30 Nov 2015 21:19:18 +0000 (UTC) (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F29431E2D
 for <svn-soc-all@FreeBSD.org>; Mon, 30 Nov 2015 21:19:17 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id tAULJHO5046491
 for <svn-soc-all@FreeBSD.org>; Mon, 30 Nov 2015 21:19:17 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id tAULJGpV046485
 for svn-soc-all@FreeBSD.org; Mon, 30 Nov 2015 21:19:16 GMT
 (envelope-from def@FreeBSD.org)
Date: Mon, 30 Nov 2015 21:19:16 GMT
Message-Id: <201511302119.tAULJGpV046485@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 def@FreeBSD.org using -f
From: def@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r294581 - in soc2013/def/crashdump-head/etc: defaults
 rc.d
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Nov 2015 21:19:18 -0000

Author: def
Date: Mon Nov 30 21:19:16 2015
New Revision: 294581
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294581

Log:
  Use dumppubkey variable for public key.

Modified:
  soc2013/def/crashdump-head/etc/defaults/rc.conf
  soc2013/def/crashdump-head/etc/rc.d/dumpon

Modified: soc2013/def/crashdump-head/etc/defaults/rc.conf
==============================================================================
--- soc2013/def/crashdump-head/etc/defaults/rc.conf	Mon Nov 30 19:16:58 2015	(r294580)
+++ soc2013/def/crashdump-head/etc/defaults/rc.conf	Mon Nov 30 21:19:16 2015	(r294581)
@@ -589,6 +589,7 @@
 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
+dumppubkey=""		# Public key for encrypted kernel crash dumps.
 savecore_flags="-m 10"	# Used if dumpdev is enabled above, and present.
 			# By default, only the 10 most recent kernel dumps
 			# are saved.

Modified: soc2013/def/crashdump-head/etc/rc.d/dumpon
==============================================================================
--- soc2013/def/crashdump-head/etc/rc.d/dumpon	Mon Nov 30 19:16:58 2015	(r294580)
+++ soc2013/def/crashdump-head/etc/rc.d/dumpon	Mon Nov 30 21:19:16 2015	(r294581)
@@ -16,7 +16,12 @@
 
 dumpon_try()
 {
-	if /sbin/dumpon ${dumpon_flags} "${1}" ; then
+	if [ -n "${dumppubkey}" ]; then
+		/sbin/dumpon -k "${dumppubkey}" "${1}"
+	else
+		/sbin/dumpon "${1}"
+	fi
+	if [ $? -eq 0 ]; then
 		# Make a symlink in devfs for savecore
 		ln -fs "${1}" /dev/dumpdev
 		return 0