Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Elijah Grubb
emulab-devel
Commits
092e2dec
Commit
092e2dec
authored
Nov 25, 2014
by
Mike Hibler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't clobber our carefully crafted pxelinux config files.
parent
d0a5f9cd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
14 deletions
+22
-14
db/dhcpd_makeconf.in
db/dhcpd_makeconf.in
+22
-14
No files found.
db/dhcpd_makeconf.in
View file @
092e2dec
...
...
@@ -431,22 +431,30 @@ while (<IF>) {
# 4. "pxe_boot_path" node_type_attribute for node type
# 5. don't set (i.e., use the dhcpd.conf global default).
#
my
$pxeboot
=
$row
{"
next_pxe_boot_path
"};
if
(
!
$pxeboot
)
{
$pxeboot
=
$row
{"
pxe_boot_path
"};
# XXX Note that we cannot do this right now for
# boot_method == "pxelinux" nodes as they use the same
# file for their regular boot. We could do this in the
# future by taking advantage of the fact that pxelinux
# tries an order list of config files for each node.
#
my
$nobj
=
Node
->
Lookup
(
$node_id
);
if
(
!
$nobj
)
{
fatal
("
Could not find Node info for
$node_id
");
}
$filename
=
SetupPXEBoot
(
$node_id
,
$mac
,
1
,
$pxeboot
);
if
(
!
$filename
)
{
# Get the node or node type default
my
$nobj
=
Node
->
Lookup
(
$node_id
);
if
(
!
$nobj
)
{
fatal
("
Could not find Node info for
$node_id
");
if
(
$nobj
->
boot_method
()
ne
"
pxelinux
")
{
my
$pxeboot
=
$row
{"
next_pxe_boot_path
"};
if
(
!
$pxeboot
)
{
$pxeboot
=
$row
{"
pxe_boot_path
"};
}
$filename
=
SetupPXEBoot
(
$node_id
,
$mac
,
1
,
$pxeboot
);
if
(
!
$filename
)
{
# Get the node or node type default
my
$path
=
$nobj
->
default_pxeboot
();
$filename
=
SetupPXEBoot
(
$node_id
,
$mac
,
0
,
$path
);
}
if
(
$filename
)
{
$filename
=
"
${spaces}
\t
filename
\"
$filename
\"
;
\n
";
}
my
$path
=
$nobj
->
default_pxeboot
();
$filename
=
SetupPXEBoot
(
$node_id
,
$mac
,
0
,
$path
);
}
if
(
$filename
)
{
$filename
=
"
${spaces}
\t
filename
\"
$filename
\"
;
\n
";
}
spit:
# Need to make MAC look right..
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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