Commit f00286bb authored by Mike Hibler's avatar Mike Hibler

Fix mishandling of adN vs. adaN compat devices.

parent 03562e4b
#!/usr/bin/perl -wT #!/usr/bin/perl -wT
# #
# Copyright (c) 2013-2017 University of Utah and the Flux Group. # Copyright (c) 2013-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -239,8 +239,15 @@ sub init_serial_map() ...@@ -239,8 +239,15 @@ sub init_serial_map()
{ {
my %snmap = (); my %snmap = ();
my $compatnames = 1; my $compatnames = 1;
my @lines;
# XXX see if there are any old /dev/ad? names
@lines = `ls /dev/ad[0-9]* 2>/dev/null`;
if (@lines == 0) {
$compatnames = 0;
}
my @lines = `ls /dev/ad* /dev/da* /dev/mfid* /dev/mfisyspd* /dev/nvd* 2>&1`; @lines = `ls /dev/ad* /dev/da* /dev/mfid* /dev/mfisyspd* /dev/nvd* 2>/dev/null`;
again: again:
foreach (@lines) { foreach (@lines) {
# XXX just use the /dev/ad? traditional names for now # XXX just use the /dev/ad? traditional names for now
......
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