Commit 0406be70 authored by Mike Hibler's avatar Mike Hibler

More changes to incorporate "mfisyspd" disks.

parent 18f6b367
......@@ -32,7 +32,7 @@ fi
if [ $# -eq 0 ]; then
if [ `uname` = FreeBSD ]; then
set -- `dmesg | egrep '(ad|da|ar|aacd|amrd|mfid)[0-9]: [0-9]+MB' | \
set -- `dmesg | egrep '(ad|da|ar|aacd|amrd|mfid|mfisyspd)[0-9]: [0-9]+MB' | \
sed -e 's/^\([a-z][^:]*\):.*/\1/'`
else
# Linux
......
......@@ -93,7 +93,7 @@ find_disks() {
_DISKS=""
for d in `sed -n 's/^\([a-z]*[0-9][0-9]*\): [0-9][0-9]*MB/\1/p' /var/run/dmesg.boot`; do
case $d in
ad*|da*|ar*|aacd*|amrd*|mfid*) _DISKS="$_DISKS $d"
ad*|da*|ar*|aacd*|amrd*|mfid*|mfisyspd*) _DISKS="$_DISKS $d"
esac
done
......
......@@ -625,10 +625,10 @@ dolinux() {
dtype="sd"
lrootdev="8${dunit}${part}"
;;
# perc
mfid[0-15])
# PERC
mfid[0-9]|mfisyspd[0-9])
dtype="sd"
dunit=`echo $disk | sed -e 's/mfid\([0-9][0-9]*\)/\1/'`
dunit=`echo $disk | sed -e 's/.*\([0-9]\)$/\1/'`
lrootdev="8${dunit}${part}"
;;
# Adaptec
......
......@@ -33,7 +33,7 @@ case $disk in
old_dtype="sd"
;;
# PERC
mfi[0-9]|mfisyspd[0-9])
mfid[0-9]|mfisyspd[0-9])
dunit=`echo $disk | sed -e 's/.*\([0-9]\)$/\1/'`
dtype="sd"
old_dtype="sd"
......
......@@ -504,7 +504,7 @@ sub freebsd_get_disksize {
#
# Take the first of ad or da, whichever we find first
#
if (/^((ad|da|ar|aacd|amrd|mfid)\d): (\d+)MB/) {
if (/^((ad|da|ar|aacd|amrd|mfid|mfisyspd)\d): (\d+)MB/) {
$diskdev = $1;
$disksize = $3;
last;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment