All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 65f21238 authored by Leigh B Stoller's avatar Leigh B Stoller

Bug fix for setting the vhost OS on the geni path.

parent 5d16f46c
......@@ -1600,19 +1600,24 @@ sub LoadVirtNodes($)
}
my $osimage;
if (defined($vnode->_parent_osinfo())) {
$osimage = $vnode->_parent_osinfo();
}
elsif ($self->option("jail_osid")) {
$osimage = OSImage->Lookup($self->option("jail_osid"));
if (!defined($fixnode->_osinfo())) {
if (defined($vnode->_parent_osinfo())) {
$osimage = $vnode->_parent_osinfo();
}
elsif ($self->option("jail_osid")) {
$osimage = OSImage->Lookup($self->option("jail_osid"));
}
else {
$osimage = $self->nodejailosinfo($vnode);
}
return -1
if (!defined($osimage));
$fixnode->_osinfo($osimage);
}
else {
$osimage = $self->nodejailosinfo($vnode);
$osimage = $fixnode->_osinfo();
}
return -1
if (!defined($osimage));
$fixnode->_osinfo($osimage);
# Convert from the name to the local object.
$vnode->_fixedvm($fixnode);
......
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