Commit 40b6e0a5 authored by Mike Hibler's avatar Mike Hibler

Bug Fix: image related changes for new release.

parent 3e44bb5f
This diff is collapsed.
......@@ -39,10 +39,10 @@ sub usage()
print STDERR " -v 2 second generation STD images (FBSD62, FC6)\n";
print STDERR " -v 3 third generation STD images (FBSD82, FEDORA15)\n";
print STDERR " -v 4 fourth generation STD images (FBSD83, FEDORA15)\n";
print STDERR "Default version is 2.\n";
print STDERR "Default version is 4.\n";
exit(-1);
}
my $version = 2;
my $version = 4;
my $mfsonly = 0;
my $images;
......
......@@ -24,6 +24,18 @@ sub Install($$$)
if ($PROTOGENI_GENIRACK) {
push(@STDIMAGES, "UBUNTU12-64-STD");
}
#
# XXX don't want to risk breaking GENIRACK, so only do this otherwise.
#
# XXX we should really download: FBSD83-64-STD, FEDORA15-64-STD,
# UBUNTU10-STD-FW, and the Linux MFSes that are also part of the
# default descriptors, but downloading images takes a long time
# so we keep the number of images to a minimum.
#
else {
@STDIMAGES = ("FBSD83-STD", "FEDORA15-STD");
$DESCRIPTORS = "$TOP_SRCDIR/install/descriptors-v4.xml";
}
Phase "IDs", "Setting up Images and OSs", sub {
if ($PROTOGENI_GENIRACK) {
......@@ -51,12 +63,12 @@ sub Install($$$)
# Load up the initial descriptors.
# Load up the images from boss.
#
Phase "descriptors", "Loading the Image and OS IDS", sub {
Phase "descriptors", "Loading the Image and OS IDs", sub {
ExecQuietFatal("cd $TOP_OBJDIR/install; ".
" $SUDO -u $PROTOUSER $WAP ".
" perl load-descriptors -a $DESCRIPTORS");
};
Phase "gendev", "Loading additional OS IDS", sub {
Phase "gendev", "Loading additional OS IDs", sub {
ExecQuietFatal("cd $TOP_OBJDIR/install; ".
" $SUDO -u $PROTOUSER $WAP ".
" perl load-descriptors $GENDEV");
......
......@@ -20,6 +20,7 @@ INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','6.2','delay','/boot/kernel.pol
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','6.2','linkdelay','/boot/kernel/kernel HZ=1000');
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','7.3','delay','/boot/kernel.poll/kernel HZ=10000');
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','8.2','delay','/boot/kernel/kernel kern.hz=10000');
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','8.3','delay','/boot/kernel/kernel kern.hz=10000');
INSERT IGNORE INTO os_boot_cmd VALUES ('Linux','9.0','linkdelay','linkdelay');
INSERT IGNORE INTO emulab_indicies (name,idx) VALUES ('cur_log_seq', 1);
......
#
# Updates to os_boot_cmd table.
#
use strict;
use libdb;
sub DoUpdate($$$)
{
my ($dbhandle, $dbname, $version) = @_;
DBQueryFatal("REPLACE INTO os_boot_cmd VALUES" .
" ('FreeBSD','8.3','delay','/boot/kernel/kernel kern.hz=10000')");
return 0;
}
1;
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