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-stable
Commits
ff4e47f9
Commit
ff4e47f9
authored
Dec 06, 2014
by
Mike Hibler
Browse files
Handle one TBPxelinuxConfig case where we should not mess with the config.
parent
4559fe46
Changes
2
Hide whitespace changes
Inline
Side-by-side
db/libdb.pm.in
View file @
ff4e47f9
...
...
@@ -584,6 +584,13 @@ sub TBPxelinuxConfig($;$)
}
} elsif (defined($part)) {
$action = "diskboot";
} elsif (!$actionp && $field eq "def_boot_osid") {
#
# We are probably calling from OSSelect after changing
# def_boot_osid but before loading the disk with that image.
# Just leave it alone.
#
return;
} else {
print("*** Warning: invalid $field info for $nodeid, ".
"booting to MFS\n");
...
...
db/nalloc.in
View file @
ff4e47f9
...
...
@@ -291,8 +291,9 @@ if (!$error && (!$noalloc || $partial) && @nodes) {
# And since the node is now allocated, we need to redo its pxelinux
# config file so it won't be stuck in pxewait
foreach
my
$node
(
@need_pxeconfig
)
{
TBPxelinuxConfig
(
$node
)
if
(
$node
->
boot_method
()
eq
"
pxelinux
");
if
(
$node
->
boot_method
()
eq
"
pxelinux
")
{
TBPxelinuxConfig
(
$node
);
}
}
}
TBDebugTimeStamp
("
updated node_activity, history, and bootlogs
");
...
...
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