From owner-svn-src-all@FreeBSD.ORG  Mon Mar 19 23:14:48 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4C94B106564A;
	Mon, 19 Mar 2012 23:14:48 +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 364768FC14;
	Mon, 19 Mar 2012 23:14:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2JNEmDL091194;
	Mon, 19 Mar 2012 23:14:48 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Received: (from jpaetzel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2JNEm5F091192;
	Mon, 19 Mar 2012 23:14:48 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Message-Id: <201203192314.q2JNEm5F091192@svn.freebsd.org>
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Mon, 19 Mar 2012 23:14:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233222 - stable/9/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: Mon, 19 Mar 2012 23:14:48 -0000

Author: jpaetzel
Date: Mon Mar 19 23:14:47 2012
New Revision: 233222
URL: http://svn.freebsd.org/changeset/base/233222

Log:
  MFC: 232895
  
  Check for intel RAID devices
  
  Submitted by:	kmoore
  Obtained from:	PC-BSD

Modified:
  stable/9/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
Directory Properties:
  stable/9/usr.sbin/pc-sysinstall/   (props changed)

Modified: stable/9/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
==============================================================================
--- stable/9/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Mon Mar 19 23:09:30 2012	(r233221)
+++ stable/9/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Mon Mar 19 23:14:47 2012	(r233222)
@@ -58,6 +58,18 @@ then
   fi
 fi
 
+# Add any RAID devices
+if [ -d "/dev/raid" ] ; then
+  cd /dev/raid
+  for i in `ls`
+  do
+    case ${i} in
+      r0|r1|r2|r3|r4|r5) SYSDISK="${SYSDISK} ${i}" ;;
+      *) ;;
+    esac
+  done
+fi
+
 # Now loop through these devices, and list the disk drives
 for i in ${SYSDISK}
 do
@@ -77,7 +89,7 @@ do
   NEWLINE=$(camcontrol identify $DEV | sed -ne 's/^device model *//p')
   if [ -z "$NEWLINE" ]; then
 	# Now try atacontrol
-  	NEWLINE=$(atacontrol list | sed -n "s|^.*$DEV <\(.*\)>.*|\1|p")
+  	NEWLINE=$(atacontrol list 2>/dev/null | sed -n "s|^.*$DEV <\(.*\)>.*|\1|p")
 	
   	if [ -z "$NEWLINE" ]; then
     		NEWLINE=" <Unknown Device>"