Commit 8e9da421 authored by Mike Hibler's avatar Mike Hibler

Unify the set of FreeBSD disk controller names recognized.

parent 9096a504
...@@ -93,7 +93,7 @@ find_disks() { ...@@ -93,7 +93,7 @@ find_disks() {
_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 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 case $d in
ad*|da*|ar*|aacd*|mfid*) _DISKS="$_DISKS $d" ad*|da*|ar*|aacd*|amrd*|mfid*) _DISKS="$_DISKS $d"
esac esac
done done
......
...@@ -631,6 +631,12 @@ dolinux() { ...@@ -631,6 +631,12 @@ dolinux() {
dunit=`echo $disk | sed -e 's/mfid\([0-9][0-9]*\)/\1/'` dunit=`echo $disk | sed -e 's/mfid\([0-9][0-9]*\)/\1/'`
lrootdev="8${dunit}${part}" lrootdev="8${dunit}${part}"
;; ;;
# Adaptec
aacd[0-7])
dunit=`echo $disk | sed -e 's/aacd\([0-7]\)/\1/'`
dtype="sd"
lrootdev="8${dunit}${part}"
;;
# Megaraid # Megaraid
amrd[0-7]) amrd[0-7])
dunit=`echo $disk | sed -e 's/amrd\([0-7]\)/\1/'` dunit=`echo $disk | sed -e 's/amrd\([0-7]\)/\1/'`
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2003-2011 University of Utah and the Flux Group. # Copyright (c) 2003-2012 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -504,7 +504,7 @@ sub freebsd_get_disksize { ...@@ -504,7 +504,7 @@ sub freebsd_get_disksize {
# #
# Take the first of ad or da, whichever we find first # Take the first of ad or da, whichever we find first
# #
if (/^((ad|da|ar|aacd|mfid)\d): (\d+)MB/) { if (/^((ad|da|ar|aacd|amrd|mfid)\d): (\d+)MB/) {
$diskdev = $1; $diskdev = $1;
$disksize = $3; $disksize = $3;
last; last;
......
#!/bin/sh #!/bin/sh
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group. # Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
# Front-end script to run the bootblock zapper. # Front-end script to run the bootblock zapper.
...@@ -32,7 +32,7 @@ fi ...@@ -32,7 +32,7 @@ fi
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
if [ `uname` = FreeBSD ]; then if [ `uname` = FreeBSD ]; then
set -- `dmesg | egrep '(ad|da|ar|amrd)[0-9]: [0-9]+MB' | \ set -- `dmesg | egrep '(ad|da|ar|aacd|amrd|mfid)[0-9]: [0-9]+MB' | \
sed -e 's/^\([a-z][^:]*\):.*/\1/'` sed -e 's/^\([a-z][^:]*\):.*/\1/'`
else else
# Linux # Linux
......
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