Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
82ee7fa3
Commit
82ee7fa3
authored
Feb 04, 2015
by
Leigh B Stoller
Browse files
Fix for image version numbers.
parent
928998ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
tbsetup/node_control.in
View file @
82ee7fa3
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-20
07
University of Utah and the Flux Group.
# Copyright (c) 2000-20
15
University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
...
...
@@ -235,7 +235,21 @@ foreach my $option (keys(%controls)) {
my
(
$admin
,
$multi
,
$physdbkey
,
$virtdbkey
,
$needs_osselect
,
$osselect_arg
,
$checkslot
)
=
@
{
$controlset
{
$option
}};
my
$value
=
$controls
{
$option
};
my
$version
=
"";
#
# OSIDs might include a version number now.
#
if
(
$needs_osselect
)
{
my
(
$osid
,
$vers
)
=
split
("
:
",
$value
);
if
(
defined
(
$vers
))
{
if
(
$vers
!~
/^\d+$/
)
{
fatal
("
Illegal value specified for
$option
: '
$value
'
");
}
$value
=
$osid
;
$version
=
"
:
${vers}
";
}
}
#
# Do a checkslot on it to make sure its valid for the DB slot.
#
...
...
@@ -256,7 +270,7 @@ foreach my $option (keys(%controls)) {
}
else
{
# Setting the field
$str
.=
"
$osselect_arg
$value
";
$str
.=
"
$osselect_arg
$
{
value
}${version}
";
}
if
(
$debug
)
{
print
"
$option
=
$value
(
$physdbkey
) made osselect str='
$str
'
\n
";
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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