Commit 3533283b authored by Jonathon Duerig's avatar Jonathon Duerig

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents f1fce167 22900058
...@@ -1077,50 +1077,52 @@ sub gendhcpdconf($$) ...@@ -1077,50 +1077,52 @@ sub gendhcpdconf($$)
my $singlenet = $$row{"SINGLENET"}; my $singlenet = $$row{"SINGLENET"};
my $inner_elab_boot = $$row{"INNER_ELAB_BOOT"}; my $inner_elab_boot = $$row{"INNER_ELAB_BOOT"};
my $plab_boot = $$row{"PLAB_BOOT"}; my $plab_boot = $$row{"PLAB_BOOT"};
my $booting;
my $dns;
if (defined $hostname) { if (defined $hostname) {
$hostname = $hostname =
"${spaces}\toption host-name \"$hostname\";\n"; "${spaces}\toption host-name \"$hostname\";\n";
} }
if (defined $filename) { if (defined $filename) {
$filename =~ s/^"(.*)"$/$1/; $filename =~ s/^"(.*)"$/$1/;
$filename = $filename =
"${spaces}\tfilename \"$filename\";\n"; "${spaces}\tfilename \"$filename\";\n";
} }
if (defined $next_server) { if (defined $next_server) {
$next_server = "${spaces}\tnext-server " . $next_server = "${spaces}\tnext-server " .
$next_server . ";\n"; $next_server . ";\n";
} }
if (defined $bootinfo_server) { if (defined $bootinfo_server) {
$bootinfo_server = "${spaces}\toption " . $bootinfo_server = "${spaces}\toption " .
"PXE.emulab-bootinfo " . $bootinfo_server . ";\n"; "PXE.emulab-bootinfo " . $bootinfo_server . ";\n";
} }
if ($inner_elab_boot) { if ($inner_elab_boot) {
if ($singlenet) { if ($singlenet) {
$booting = "${spaces}\tignore booting;\n"; $booting = "${spaces}\tignore booting;\n";
} else { } else {
$dns = "${spaces}\toption ". $dns = "${spaces}\toption ".
"domain-name-servers 1.1.1.1;\n"; "domain-name-servers 1.1.1.1;\n";
} }
}
#
# Handle alternate boot program filename if it exists.
# Use mutable nodes.pxe_boot_path if it is defined.
# Otherwise use the node_types.pxe_boot_path if it is
# defined. Otherwise don't set anything (use the global
# default).
#
if (defined $filename) {
# make sure it is pretty constrained
if ($filename =~ /^\/tftpboot\// && $fn !~ /\.\./) {
$filename = "${spaces}\tfilename \"$filename\";\n";
} }
#
# Handle alternate boot program filename if it exists.
# Use mutable nodes.pxe_boot_path if it is defined.
# Otherwise use the node_types.pxe_boot_path if it is
# defined. Otherwise don't set anything (use the global
# default).
#
if (defined $filename) {
# make sure it is pretty constrained
if ($filename =~ /^\/tftpboot\// && $fn !~ /\.\./) {
$filename = "${spaces}\tfilename \"$filename\";\n";
}
} }
# Need to make MAC look right.. # Need to make MAC look right..
......
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