Commit ca48ed4a authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Bugfix: Apply default protogeni os whether or not node is wildcarded.

parent 71da91ff
...@@ -1100,14 +1100,23 @@ sub GetTicketAuxAux($$$$$$$$$) ...@@ -1100,14 +1100,23 @@ sub GetTicketAuxAux($$$$$$$$$)
$pctype = $node->type() $pctype = $node->type()
if (!defined($pctype)); if (!defined($pctype));
} }
# #
# If no osname by this point, try for the default. # If no osname, check for protogeni default osname
# #
if (defined($node) && !defined($osname)) { if (! defined($osname)) {
my $protogeni_os = undef; my $protogeni_os = undef;
if (GetSiteVar('protogeni/default_osname', \$protogeni_os)) { if (GetSiteVar('protogeni/default_osname', \$protogeni_os)
&& $protogeni_os ne "") {
$osname = $protogeni_os; $osname = $protogeni_os;
} elsif (defined($node->default_osid())) { }
}
#
# If no osname by this point, try for the default.
#
if (defined($node) && !defined($osname)) {
if (defined($node->default_osid())) {
my $osinfo = OSinfo->Lookup($node->default_osid()); my $osinfo = OSinfo->Lookup($node->default_osid());
$osname = $osinfo->osname() $osname = $osinfo->osname()
if (defined($osinfo)); if (defined($osinfo));
......
Supports Markdown
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