From owner-svn-src-stable-7@FreeBSD.ORG  Sat Sep  5 18:44:36 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D15C11065672;
	Sat,  5 Sep 2009 18:44:36 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C036C8FC0A;
	Sat,  5 Sep 2009 18:44:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n85Iiajq061375;
	Sat, 5 Sep 2009 18:44:36 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n85IiaNs061373;
	Sat, 5 Sep 2009 18:44:36 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <200909051844.n85IiaNs061373@svn.freebsd.org>
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Sat, 5 Sep 2009 18:44:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196870 - stable/7/etc/rc.d
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Sep 2009 18:44:36 -0000

Author: rodrigc
Date: Sat Sep  5 18:44:36 2009
New Revision: 196870
URL: http://svn.freebsd.org/changeset/base/196870

Log:
  This set of MFC's brings savecore closer to the trunk version.
  Now, crashinfo will only be run if the following conditions are true:
  - savecore -C determines that a crash dump exists
  - crashinfo_enable="YES"
  
  MFC: 182460
  
     Add the ability to run /usr/sbin/crashinfo on a new core dump automatically
     during boot.
  
  MFC: 180318
  
     Remove the $DUMPDIR variable. It's redundant and the rest of the
     script uses $dumpdir directly.
  
  MFC: 180317
     Make checking for the availability of core dumps work in the case
     that $dumpdev is not set to "AUTO".

Modified:
  stable/7/etc/rc.d/savecore

Modified: stable/7/etc/rc.d/savecore
==============================================================================
--- stable/7/etc/rc.d/savecore	Sat Sep  5 17:40:27 2009	(r196869)
+++ stable/7/etc/rc.d/savecore	Sat Sep  5 18:44:36 2009	(r196870)
@@ -52,10 +52,25 @@ savecore_prestart()
 
 savecore_start()
 {
+	local dev
+
+	case "${dumpdev}" in
+	[Aa][Uu][Tt][Oo])
+		dev=
+		;;
+	*)
+		dev="${dumpdev}"
+		;;
+	esac
+
 	echo "Checking for core dump on ${dumpdev}..."
-	savecore ${savecore_flags} ${dumpdir} ${dumpdev}
-	if checkyesno crashinfo_enable; then
-		${crashinfo_program} -d ${dumpdir}
+	if savecore -C "${dumpdir}" "${dev}" >/dev/null; then
+		savecore ${savecore_flags} ${dumpdir} ${dumpdev}
+		if checkyesno crashinfo_enable; then
+			${crashinfo_program} -d ${dumpdir}
+		fi
+	else
+		[ -z "${rc_quiet}" ] && echo "No core dumps found"
 	fi
 }