Commit 4c29410e authored by Mike Hibler's avatar Mike Hibler
Browse files

Merge remote branch 'central/master' into frisbee-mserver

parents d77c33b7 488f320e
......@@ -1794,7 +1794,7 @@ sub StubHandleEvent($$$) {
# Print the stuff we care about to stdout for the parent to pick up.
#
print "OBJTYPE='$objtype', OBJNAME='$objname', EVENTTYPE='$eventtype'\n";
if ($debug) {
if (1) {
print STDERR
"OBJTYPE='$objtype', OBJNAME='$objname', EVENTTYPE='$eventtype'\n";
}
......@@ -1827,7 +1827,7 @@ sub PollEvents($$)
if ($pollval > 0) {
my $buf;
while (sysread($childpipe, $buf, 4096)) {
while (sysread($childpipe, $buf, 8192)) {
#
# It is possible that we will get multiple lines
# of output in one read. Hopefully not so much that we get
......
......@@ -1478,13 +1478,18 @@ sub ListHistory($)
#
sub CheckCredentials($)
{
if (! ref($_[0]) != "ARRAY") {
return
GeniResponse->MalformedArgsResponse("Credentials should be a ".
"array not a singleton");
}
my @credentials = @{ $_[0] };
if (scalar(@credentials) != 1) {
return
GeniResponse->MalformedArgsResponse("Wrong number of credentials");
}
my $credential = GeniCredential->CreateFromSigned($credentials[0]);
my $credential = GeniCredential->CreateFromSigned($credentials[0]);
if (!defined($credential)) {
return GeniResponse->Create(GENIRESPONSE_ERROR, undef,
"Could not create credential object");
......
......@@ -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}=".
......
......@@ -93,7 +93,7 @@ find_disks() {
_DISKS=""
for d in `sed -n 's/^\([a-z]*[0-9][0-9]*\): [0-9][0-9]*MB/\1/p' /var/run/dmesg.boot`; do
case $d in
ad*|da*|ar*|aacd*) _DISKS="$_DISKS $d"
ad*|da*|ar*|aacd*|mfid*) _DISKS="$_DISKS $d"
esac
done
......@@ -145,6 +145,16 @@ loadone() {
echo "Loading image #$_NUM"
# Parse dem args
ADDR=""
SERVER=""
PART=""
PARTOS=""
DISK=""
ZFILL=""
ACPI=""
ASF=""
MBRVERS=""
PREPARE=""
for parm in $_LOADINFO; do
case $parm in
ADDR=*|\
......
# PROVIDE: cdroot
# BEFORE: disks netif
# BEFORE: disks
# KEYWORD: FreeBSD
#
......@@ -70,8 +70,9 @@ mkunionfs() {
# better be >= 6.3
# no, I don't know sed or awk
major=`uname -r | sed -e 's/\..*$//`
minor=`uname -r | sed -e 's/^[0-9]\.//' | sed -e 's/[^0-9]*$//'`
major=`uname -r | sed -e 's/\..*$//'`
# I DO know sed
minor=`uname -r | sed -e 's/^[0-9]\.\([0-9][0-9]*\).*/\1/'`
if [ $major -lt 6 -o $major -eq 6 -a $minor -lt 3 ]; then
echo -n "FreeBSD version ${major}.${minor} did not have a"
......@@ -102,7 +103,7 @@ mkunionfs() {
mkdir ${bufdir}/${mntpt}
echo "Generating ${mntpt} via unionfs"
# -o copymode=transparent \
mount_unionfs -o copymode=transparent \
mount_unionfs -o noatime -o copymode=transparent \
${bufdir}/${mntpt} $mntpt
chkerr $? "mount_unionfs ${bufdir}/${mntpt} $mntpt"
done
......
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