From owner-svn-src-head@FreeBSD.ORG  Wed Feb 23 17:52:26 2011
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 6B1E1106564A;
	Wed, 23 Feb 2011 17:52:26 +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 59F838FC0C;
	Wed, 23 Feb 2011 17:52:26 +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 p1NHqQ7f002370;
	Wed, 23 Feb 2011 17:52:26 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Received: (from jpaetzel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NHqQkB002368;
	Wed, 23 Feb 2011 17:52:26 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Message-Id: <201102231752.p1NHqQkB002368@svn.freebsd.org>
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Wed, 23 Feb 2011 17:52:26 +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: r218975 - head/usr.sbin/pc-sysinstall/backend-query
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: Wed, 23 Feb 2011 17:52:26 -0000

Author: jpaetzel
Date: Wed Feb 23 17:52:26 2011
New Revision: 218975
URL: http://svn.freebsd.org/changeset/base/218975

Log:
  Alter comment to reflect change in code.
  Try atacontrol if camcontrol fails.
  
  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	Wed Feb 23 17:17:05 2011	(r218974)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Wed Feb 23 17:52:26 2011	(r218975)
@@ -73,10 +73,15 @@ do
     esac
   fi
 
-  # Check the dmesg output for some more info about this device
-  NEWLINE=$(camcontrol identify $DEV | grep "device model" | tr -s ' ' | sed 's |device model ||g')
+  # Try and find some identification information with camcontrol or atacontrol
+  NEWLINE=$(camcontrol identify $DEV | sed -ne 's/^device model *//p')
   if [ -z "$NEWLINE" ]; then
-    NEWLINE=" <Unknown Device>"
+	# Now try atacontrol
+  	NEWLINE=$(atacontrol list | sed -n "s|^.*$DEV <\(.*\)>.*|\1|p")
+	
+  	if [ -z "$NEWLINE" ]; then
+    		NEWLINE=" <Unknown Device>"
+	fi
   fi
 
   if [ -n "${FLAGS_MD}" ] && echo "${DEV}" | grep -E '^md[0-9]+' >/dev/null 2>/dev/null