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
ca48ed4a
Commit
ca48ed4a
authored
Feb 10, 2012
by
Jonathon Duerig
Browse files
Bugfix: Apply default protogeni os whether or not node is wildcarded.
parent
71da91ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniCM.pm.in
View file @
ca48ed4a
...
...
@@ -1100,14 +1100,23 @@ sub GetTicketAuxAux($$$$$$$$$)
$pctype = $node->type()
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;
if (GetSiteVar('
protogeni
/
default_osname
', \$protogeni_os)) {
if (GetSiteVar('
protogeni
/
default_osname
', \$protogeni_os)
&& $protogeni_os ne "") {
$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());
$osname = $osinfo->osname()
if (defined($osinfo));
...
...
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