diff options
| author | Josh Paetzel <jpaetzel@FreeBSD.org> | 2012-03-12 21:24:40 +0000 |
|---|---|---|
| committer | Josh Paetzel <jpaetzel@FreeBSD.org> | 2012-03-12 21:24:40 +0000 |
| commit | 689d8111652367bc748858185d1bcebcec76334d (patch) | |
| tree | 88ea2874937d2d3d625358c291c28e0e2dd2d708 /usr.sbin | |
| parent | 937b9d55e757043a101d00067eb541a299c900bb (diff) | |
| download | src-689d8111652367bc748858185d1bcebcec76334d.tar.gz src-689d8111652367bc748858185d1bcebcec76334d.zip | |
Check for intel RAID devices
Submitted by: kris
Obtained from: PC-BSD
Notes
Notes:
svn path=/head/; revision=232895
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend-query/disk-list.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/usr.sbin/pc-sysinstall/backend-query/disk-list.sh b/usr.sbin/pc-sysinstall/backend-query/disk-list.sh index 8baa8d21dee3..c8b53065bcf4 100755 --- a/usr.sbin/pc-sysinstall/backend-query/disk-list.sh +++ b/usr.sbin/pc-sysinstall/backend-query/disk-list.sh @@ -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>" |