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
3533283b
Commit
3533283b
authored
May 25, 2010
by
Jonathon Duerig
Browse files
Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel
parents
f1fce167
22900058
Changes
1
Hide whitespace changes
Inline
Side-by-side
tmcd/common/libsetup.pm
View file @
3533283b
...
...
@@ -1077,50 +1077,52 @@ sub gendhcpdconf($$)
my
$singlenet
=
$$row
{"
SINGLENET
"};
my
$inner_elab_boot
=
$$row
{"
INNER_ELAB_BOOT
"};
my
$plab_boot
=
$$row
{"
PLAB_BOOT
"};
my
$booting
;
my
$dns
;
if
(
defined
$hostname
)
{
$hostname
=
if
(
defined
$hostname
)
{
$hostname
=
"
${spaces}
\t
option host-name
\"
$hostname
\"
;
\n
";
}
}
if
(
defined
$filename
)
{
if
(
defined
$filename
)
{
$filename
=~
s/^"(.*)"$/$1/
;
$filename
=
"
${spaces}
\t
filename
\"
$filename
\"
;
\n
";
}
}
if
(
defined
$next_server
)
{
if
(
defined
$next_server
)
{
$next_server
=
"
${spaces}
\t
next-server
"
.
$next_server
.
"
;
\n
";
}
}
if
(
defined
$bootinfo_server
)
{
if
(
defined
$bootinfo_server
)
{
$bootinfo_server
=
"
${spaces}
\t
option
"
.
"
PXE.emulab-bootinfo
"
.
$bootinfo_server
.
"
;
\n
";
}
}
if
(
$inner_elab_boot
)
{
if
(
$inner_elab_boot
)
{
if
(
$singlenet
)
{
$booting
=
"
${spaces}
\t
ignore booting;
\n
";
}
else
{
$dns
=
"
${spaces}
\t
option
"
.
"
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}
\t
filename
\"
$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}
\t
filename
\"
$filename
\"
;
\n
";
}
}
# Need to make MAC look right..
...
...
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