Commit 30900fcf authored by Mike Hibler's avatar Mike Hibler
Browse files

Merge remote branch 'origin/master'

parents 35fea206 4c410b6f
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group.
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -200,7 +200,7 @@ sub whacksome($@) {
warn "WhOL: could not send WhOL packets\n";
$failed++;
} else {
print STDERR "Whacked ", @nodelist, "\n";
print STDERR "Whacked ", join(' ', @nodelist), "\n";
}
}
......
......@@ -1196,6 +1196,9 @@ sub SetupOpsNode($)
print RC "inetd_enable=\"YES\"\n";
print RC "sendmail_enable=\"YES\"\n";
if ($emulabconfig{"CONFIG_MAILMAN"}) {
print RC "mailman_enable=\"YES\"\n";
}
print RC "sshd_enable=\"YES\"\n";
print RC "ntpdate_enable=\"YES\"\n";
......@@ -1617,7 +1620,10 @@ sub SetupBossNode()
# Disable TSO. It causes horrific xmit throughput with divert sockets.
# See: http://www.freebsd.org/cgi/query-pr.cgi?pr=121257
#
my $tso = "-tso";
my $tso = "";
if ($FBSD_VERSION > 6) {
$tso = "-tso";
}
print RC "network_interfaces=\"$outer_controlif\"\n";
print RC "ifconfig_${outer_controlif}=".
......
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