svn commit: r233222 - stable/9/usr.sbin/pc-sysinstall/backend-query

[Josh Paetzel]

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>"