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
b96efc7b
Commit
b96efc7b
authored
Apr 22, 2014
by
Leigh B Stoller
Browse files
Minor fix to imageid regex.
parent
11887440
Changes
2
Hide whitespace changes
Inline
Side-by-side
clientside/tmcc/common/mkvnode.pl
View file @
b96efc7b
...
...
@@ -398,7 +398,8 @@ if (scalar(@tmp) && exists($tmp[0]->{"WHAT"})) {
fatal
("
vnode
$vnodeid
in reloading, but got no loadinfo!
");
}
else
{
if
(
$tmp
[
0
]
->
{"
IMAGEID
"}
=~
/^([-\d\w]+),([-\d\w]+),([-\d\w]+)$/
)
{
if
(
$tmp
[
0
]
->
{"
IMAGEID
"}
=~
/^([-\d\w]+),([-\d\w]+),([-\d\w\.]+)$/
)
{
$vnconfig
{"
reloadinfo
"}
=
$tmp
[
0
];
$vnconfig
{"
image
"}
=
"
$1-$2-$3
";
}
...
...
clientside/tmcc/linux/libvnode.pm
View file @
b96efc7b
...
...
@@ -484,7 +484,8 @@ sub downloadImage($$$$) {
if
(
$reload_args_ref
->
{"
SERVER
"}
=~
/^(\d+\.\d+\.\d+\.\d+)$/
)
{
$server
=
$
1
;
}
if
(
$reload_args_ref
->
{"
IMAGEID
"}
=~
/^([-\d\w]+),([-\d\w]+),([-\d\w]+)$/
)
{
if
(
$reload_args_ref
->
{"
IMAGEID
"}
=~
/^([-\d\w]+),([-\d\w]+),([-\d\w\.]+)$/
)
{
$imageid
=
"
$1/$3
";
}
if
(
SHAREDHOST
())
{
...
...
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