From owner-svn-src-all@FreeBSD.ORG  Tue Feb 22 19:18:56 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9CEB71065672;
	Tue, 22 Feb 2011 19:18:56 +0000 (UTC)
	(envelope-from jpaetzel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8AC988FC0C;
	Tue, 22 Feb 2011 19:18:56 +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 p1MJIu5H018895;
	Tue, 22 Feb 2011 19:18:56 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Received: (from jpaetzel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MJIukV018893;
	Tue, 22 Feb 2011 19:18:56 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Message-Id: <201102221918.p1MJIukV018893@svn.freebsd.org>
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Tue, 22 Feb 2011 19:18:56 +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: r218959 - head/usr.sbin/pc-sysinstall/backend-query
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Feb 2011 19:18:56 -0000

Author: jpaetzel
Date: Tue Feb 22 19:18:56 2011
New Revision: 218959
URL: http://svn.freebsd.org/changeset/base/218959

Log:
  Better method for grabbing disk name, dmesg may produce mangled output.
  
  Approved by:	kib (mentor, implicit)

Modified:
  head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh

Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Tue Feb 22 19:05:42 2011	(r218958)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Tue Feb 22 19:18:56 2011	(r218959)
@@ -74,7 +74,7 @@ do
   fi
 
   # Check the dmesg output for some more info about this device
-  NEWLINE=$(dmesg | sed -n "s/^$DEV: .*<\(.*\)>.*$/ <\1>/p" | head -n 1)
+  NEWLINE=$(camcontrol identify $DEV | grep "device model" | tr -s ' ' | sed 's |device model ||g')
   if [ -z "$NEWLINE" ]; then
     NEWLINE=" <Unknown Device>"
   fi