Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
8e9da421
Commit
8e9da421
authored
Mar 15, 2012
by
Mike Hibler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unify the set of FreeBSD disk controller names recognized.
parent
9096a504
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
clientside/tmcc/freebsd/rc.frisbee
clientside/tmcc/freebsd/rc.frisbee
+1
-1
clientside/tmcc/freebsd/slicefix
clientside/tmcc/freebsd/slicefix
+6
-0
install/newclient
install/newclient
+2
-2
os/zapdisk/diskzap
os/zapdisk/diskzap
+2
-2
No files found.
clientside/tmcc/freebsd/rc.frisbee
View file @
8e9da421
...
...
@@ -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
*
|
mfid
*
)
_DISKS
=
"
$_DISKS
$d
"
ad
*
|
da
*
|
ar
*
|
aacd
*
|
amrd
*
|
mfid
*
)
_DISKS
=
"
$_DISKS
$d
"
esac
done
...
...
clientside/tmcc/freebsd/slicefix
View file @
8e9da421
...
...
@@ -631,6 +631,12 @@ dolinux() {
dunit
=
`
echo
$disk
|
sed
-e
's/mfid\([0-9][0-9]*\)/\1/'
`
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
amrd[0-7]
)
dunit
=
`
echo
$disk
|
sed
-e
's/amrd\([0-7]\)/\1/'
`
...
...
install/newclient
View file @
8e9da421
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2003-201
1
University of Utah and the Flux Group.
# Copyright (c) 2003-201
2
University of Utah and the Flux Group.
# All rights reserved.
#
...
...
@@ -504,7 +504,7 @@ sub freebsd_get_disksize {
#
# 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
;
$disksize
=
$
3
;
last
;
...
...
os/zapdisk/diskzap
View file @
8e9da421
#!/bin/sh
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-20
05
University of Utah and the Flux Group.
# Copyright (c) 2000-20
12
University of Utah and the Flux Group.
# All rights reserved.
#
# Front-end script to run the bootblock zapper.
...
...
@@ -32,7 +32,7 @@ fi
if
[
$#
-eq
0
]
;
then
if
[
`
uname
`
=
FreeBSD
]
;
then
set
--
`
dmesg | egrep
'(ad|da|ar|a
mr
d)[0-9]: [0-9]+MB'
|
\
set
--
`
dmesg | egrep
'(ad|da|ar|a
acd|amrd|mfi
d)[0-9]: [0-9]+MB'
|
\
sed
-e
's/^\([a-z][^:]*\):.*/\1/'
`
else
# Linux
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment