Commit 2ae2c685 authored by Mike Hibler's avatar Mike Hibler

Some initial changes for m510 cartridges.

Allow "nvd" (NVM) disks and "mlxen" control network.
parent 92d9d773
......@@ -636,7 +636,7 @@ sub freebsd_get_disksize {
#
# Take the first disk of a recognized type
#
if (/^((ad|da|ar|aacd|amrd|mfid|mfisyspd)\d+): (\d+)MB/) {
if (/^((ad|da|ar|aacd|amrd|mfid|mfisyspd|nvd)\d+): (\d+)MB/) {
$diskdev = $1;
$disksize = $3;
last;
......
......@@ -883,6 +883,12 @@ dolinux() {
dunit=`echo $disk | sed -e 's/ada\([0-9][0-9]*\)$/\1/'`
lrootdev="8${dunit}${part}"
;;
# NVM disks
nvd[0-9])
dtype="sd"
dunit=`echo $disk | sed -e 's/nvd\([0-9][0-9]*\)$/\1/'`
lrootdev="8${dunit}${part}"
;;
# SCSI
da[0-7])
dtype="sd"
......
......@@ -177,13 +177,14 @@ cnet_start()
#
# XXX yow! If we don't come up with anything, we have to reconsider
# some of those interface types we skipped. For now, just ix interfaces
# because Clemson has an ix control network.
# some of those interface types we skipped:
# ix because Clemson has an ix control network,
# mlxen because Utah (will have) x86 Moonshot cartridges
#
if [ -z "$_ifs" ]; then
for _if in $network_interfaces; do
case $_if in
ix[0-9])
ix[01]|mlxen[01])
_ifs="$_ifs $_if"
;;
*)
......
......@@ -192,13 +192,14 @@ cnet_start()
#
# XXX yow! If we don't come up with anything, we have to reconsider
# some of those interface types we skipped. For now, just ix interfaces
# because Clemson has an ix control network.
# some of those interface types we skipped:
# ix because Clemson has an ix control network,
# mlxen because Utah (will have) x86 Moonshot cartridges
#
if [ -z "$_ifs" ]; then
for _if in $network_interfaces; do
case $_if in
ix[0-9])
ix[01]|mlxen[01])
_ifs="$_ifs $_if"
;;
*)
......
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