From owner-svn-src-head@FreeBSD.ORG  Tue Nov 30 16:04:40 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ACF5B1065673;
	Tue, 30 Nov 2010 16:04:40 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B7B58FC17;
	Tue, 30 Nov 2010 16:04:40 +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 oAUG4emd008817;
	Tue, 30 Nov 2010 16:04:40 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAUG4edL008815;
	Tue, 30 Nov 2010 16:04:40 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201011301604.oAUG4edL008815@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 30 Nov 2010 16:04:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216077 - head/usr.sbin/crashinfo
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Nov 2010 16:04:40 -0000

Author: cperciva
Date: Tue Nov 30 16:04:40 2010
New Revision: 216077
URL: http://svn.freebsd.org/changeset/base/216077

Log:
  Teach crashinfo(8) to look at the currently running kernel (based on the
  kern.bootfile sysctl).  Prior to this commit, crashinfo(8) only looks at
  /boot/*/kernel; this includes the usual places where kernels reside, so
  for most systems this will have no effect.
  
  Approved by:	jhb
  MFC after:	3 days

Modified:
  head/usr.sbin/crashinfo/crashinfo.sh

Modified: head/usr.sbin/crashinfo/crashinfo.sh
==============================================================================
--- head/usr.sbin/crashinfo/crashinfo.sh	Tue Nov 30 16:00:59 2010	(r216076)
+++ head/usr.sbin/crashinfo/crashinfo.sh	Tue Nov 30 16:04:40 2010	(r216077)
@@ -53,7 +53,7 @@ find_kernel()
 	}' $INFO)
 
 	# Look for a matching kernel version.
-	for k in /boot/kernel/kernel $(ls -t /boot/*/kernel); do
+	for k in `sysctl -n kern.bootfile` $(ls -t /boot/*/kernel); do
 		kvers=$(echo 'printf "  Version String: %s", version' | \
 		    gdb -x /dev/stdin -batch $k 2>/dev/null)
 		if [ "$ivers" = "$kvers" ]; then