Commit 84ef9202 authored by Mike Hibler's avatar Mike Hibler

Fix some nits:

 * remove extra newline in bootwhat data
 * check command line for custom kernel in FBSD6 delay code
 * de-utahize a hostname lookup in ixpboot
parent f8e4942f
......@@ -859,7 +859,17 @@ sub checkkernel($$)
if ($hz =~ /hz = (\d+),/) {
$hz = int($1);
if ($hz != $kernelhz) {
print STDOUT "Updating kernel HZ ...\n";
print STDOUT "Updating kernel HZ ($hz -> $kernelhz) ...\n";
#
# See if there is a custom Emulab command line setting.
# If so, warn and do not change.
#
my $binfo = `$BINDIR/tmcc bootwhat`;
if ($binfo =~ /HZ=(\d+)/ && int($1) == $hz) {
print "*** WARNING: custom HZ value on command line, ".
"not changing to $kernelhz.\n";
return 0;
}
if (-e "/boot/loader.conf") {
#
# If already running a custom HZ rate, don't change it.
......
#!/usr/bin/perl -wT
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# All rights reserved.
#
# TODO: Startup command in rc.ixp. Use old version.
......@@ -242,7 +242,7 @@ foreach my $conf (keys(%config)) {
print RC "export HOST_CNTL_I=" . `$BINDIR/control_interface`;
print UC "HOST_CNTL_I=" . `$BINDIR/control_interface`;
# And this. Could be done elsewhere ...
my (undef,undef,undef,undef,@ipaddrs) = gethostbyname("fs.emulab.net");
my (undef,undef,undef,undef,@ipaddrs) = gethostbyname("fs");
$FSIP = inet_ntoa($ipaddrs[0]);
print RC "export FS_IP=$FSIP\n";
print UC "FS_IP=$FSIP\n";
......
......@@ -7321,7 +7321,7 @@ COMMAND_PROTOTYPE(dobootwhat)
boot_whatp->what.mfs);
}
if (strlen(boot_whatp->cmdline)) {
bufp += OUTPUT(bufp, ebufp - bufp, " CMDLINE='%s'\n",
bufp += OUTPUT(bufp, ebufp - bufp, " CMDLINE='%s'",
boot_whatp->cmdline);
}
bufp += OUTPUT(bufp, ebufp - bufp, "\n");
......
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