Author: jpaetzel
Date: Mon Mar 12 21:24:40 2012
New Revision: 232895
URL: http://svn.freebsd.org/changeset/base/232895
Log:
Check for intel RAID devices
Submitted by: kris
Obtained from: PC-BSD
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 Mon Mar 12
21:07:22 2012 (r232894)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-list.sh Mon Mar 12
21:24:40 2012 (r232895)
@@ -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>"
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
