Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
e9fccb12
Commit
e9fccb12
authored
Aug 13, 2013
by
Mike Hibler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix to handle 9.x and above kernels that use "ada" device names.
We map them to their "formerly known as" ad names.
parent
f9fbab88
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
3 deletions
+21
-3
install/newclient
install/newclient
+21
-3
No files found.
install/newclient
View file @
e9fccb12
#!/usr/bin/perl -w
#
# Copyright (c) 2003-201
2
University of Utah and the Flux Group.
# Copyright (c) 2003-201
3
University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
...
...
@@ -519,9 +519,27 @@ sub freebsd_get_disksize {
while
(
<
DMESG
>
)
{
chomp
;
#
# Take the first of ad or da, whichever we find first
# FreeBSD 9.x and above have renamed IDE and SATA devs.
# Use the compat name for now.
#
if
(
/^((ad|da|ar|aacd|amrd|mfid|mfisyspd)\d): (\d+)MB/
)
{
if
(
/^(ada\d+): (\d+)MB/
)
{
$diskdev
=
$
1
;
$disksize
=
$
2
;
next
;
}
if
(
/^(ada\d+): Previously was known as (ad\d+)/
)
{
if
(
defined
(
$disksize
)
&&
defined
(
$diskdev
)
&&
$
1
eq
$diskdev
)
{
$diskdev
=
$
2
;
}
else
{
$diskdev
=
"";
}
last
;
}
#
# Take the first disk of a recognized type
#
if
(
/^((ad|da|ar|aacd|amrd|mfid|mfisyspd)\d+): (\d+)MB/
)
{
$diskdev
=
$
1
;
$disksize
=
$
3
;
last
;
...
...
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