Commit 3f1ded68 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'mymaster'

parents 2bce24fc 81c8a5d1
......@@ -112,9 +112,20 @@ if (! $nickname) {
}
$nickname = lc($nickname);
print STDERR "Resetting hostname to ${nickname}${domain} ... ";
#
# Watch for setting to something > 64 chars; breaks almost everywhere.
# Use just the nickname, which will still resolve properly cause of the
# search clause in /etc/resolv.conf. It *CANNOT* be just the vname, since
# that would conflict with experimental interface names in /etc/hosts.
#
my $newhostname = "${nickname}${domain}";
if (!$USEPNAME && length($newhostname) > 64) {
$newhostname = $nickname;
}
print STDERR "Resetting hostname to $newhostname ... ";
if (system("hostname", "${nickname}${domain}")) {
if (system("hostname", $newhostname)) {
print STDERR "*** FAILED!\n";
exit 1;
}
......
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -97,11 +97,19 @@ else {
}
#
# Set hostname. This output is redirected to log file by caller.
# Watch for setting to something > 64 chars; breaks almost everywhere.
# Use just the nickname, which will still resolve properly cause of the
# search clause in /etc/resolv.conf. It *CANNOT* be just the vname, since
# that would conflict with experimental interface names in /etc/hosts.
#
print STDERR "Resetting hostname to ${nickname}${domain} ... ";
my $newhostname = "${nickname}${domain}";
if (!$USEPNAME && length($newhostname) > 64) {
$newhostname = $nickname;
}
print STDERR "Resetting hostname to $newhostname ... ";
system("/bin/hostname ${nickname}${domain}");
system("/bin/hostname $newhostname");
if ($?) {
print STDERR "*** FAILED!\n";
exit 1;
......
......@@ -11,7 +11,7 @@ use EmulabConstants;
my $UTAHURL = "http://www.emulab.net/downloads";
my $DESCRIPTORS = "$TOP_SRCDIR/install/descriptors-xen.xml";
my $XENIMAGE = "XEN41-64-STD";
my $XENIMAGE = "XEN43-64-STD";
my $STDIMAGESURL = "$UTAHURL/images-STD";
sub Install($$$)
......
#!/bin/sh
#
# Check local databases.
#
# PROVIDE: tbdbcheck
# REQUIRE: mysql
# BEFORE: testbed
# KEYWORD: shutdown
MAINSITE="@TBMAINSITE@"
PROTOGENI="@PROTOGENI_SUPPORT@"
DBNAME="@TBDBNAME@"
LOGFILE="/var/log/mysqlcheck.log"
case "$1" in
start)
rm -f $LOGFILE
if [ $MAINSITE == "0" ]; then
echo "*** Checking $DBNAME ..." >> $LOGFILE
mysqlcheck --auto-repair $DBNAME >> $LOGFILE
fi
if [ $PROTOGENI != "0" ]; then
echo "*** Checking geni ..." >> $LOGFILE
mysqlcheck --auto-repair geni >> $LOGFILE
echo "*** Checking geni-ch ..." >> $LOGFILE
mysqlcheck --auto-repair geni-ch >> $LOGFILE
echo "*** Checking geni-cm ..." >> $LOGFILE
mysqlcheck --auto-repair geni-cm >> $LOGFILE
fi
;;
stop)
;;
*)
echo ""
echo "Usage: `basename $0` { start | stop }"
echo ""
exit 64
;;
esac
exit 0
......@@ -889,8 +889,10 @@ class Image
if ($does) {
$parentosinfo = OSinfo::LookupByName("emulab-ops",
"XEN41-64-STD");
"XEN43-64-STD");
if (!$parentosinfo) {
$parentosinfo = OSinfo::LookupByName("emulab-ops",
"XEN41-64-STD");
return -1;
}
$parentosid = $parentosinfo->osid();
......
......@@ -1004,9 +1004,11 @@ if (!isset($submit)) {
#
# XXX Need to fix this.
#
$def_parentosinfo = OSinfo::LookupByName("emulab-ops", "XEN41-64-STD");
$def_parentosinfo = OSinfo::LookupByName("emulab-ops", "XEN43-64-STD");
if (! $def_parentosinfo) {
TBERROR("Could not lookup osinfo object for XEN41-64-STD", 1);
$def_parentosinfo = OSinfo::LookupByName("emulab-ops",
"XEN41-64-STD");
TBERROR("Could not lookup osinfo object for XEN image", 1);
}
$defaults["def_parentosid"] = $def_parentosinfo->osid();
......
Supports Markdown
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