Commit d7a529c0 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Add Fedora as an OS, rather then using Linux.

parent d897729c
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -162,7 +162,7 @@ my $events_result =
"where ev.pid='$pid' and ev.eid='$eid' and ".
" (vl.uselinkdelay!=0 or e.uselinkdelays!=0 or ".
" e.forcelinkdelays!=0) and ev_ob.type='LINK' and ".
" (o.os is NULL or o.os='Linux')");
" (o.os is NULL or o.os='Linux' or o.os='Fedora')");
if ($events_result->num_rows) {
fatal("Oops, cannot send static events to linkdelay agents on Linux!");
}
......
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -722,7 +722,8 @@ sub doSwapin($) {
" (o.pid=vl.pid or o.pid='" . TBOPSPID() . "') ".
"where (vl.uselinkdelay!=0 or e.uselinkdelays!=0 or ".
" e.forcelinkdelays!=0) and ".
" (o.os is NULL or o.os='Linux') and ".
" (o.os is NULL or o.os='Linux' or ".
" o.os='Fedora') and ".
" e.pid='$pid' and e.eid='$eid'");
if ($db_result->numrows) {
......@@ -1003,7 +1004,7 @@ sub doSwapin($) {
TBDebugTimeStamp("gentopofile finished");
# XXX fer now hack
if (!$firewalled && !$elabinelab &&
if (0 && !$firewalled && !$elabinelab &&
($pid eq "testbed" || $pid eq "tbres")) {
DBQueryWarn("update experiments set ".
" savedisk=1 where pid='$pid' and eid='$eid'");
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -606,10 +606,11 @@ function SPITFORM($formfields, $errors)
here are some guidelines:
<ul>
<li> if you customized one of our standard Linux
images (RHL-*) then it is partition 2.
(RHL*) or Fedora images (FC*) then it is
partition 2.
</li>
<li> if you customized one of our standard BSD
images (FBSD-*) then it is partition 1.
images (FBSD*) then it is partition 1.
</li>
<li> if you customized one of our standard Windows XP
images then it is partition 1, and make sure
......@@ -629,15 +630,16 @@ function SPITFORM($formfields, $errors)
<ul>
<li> Mark ping and/or ssh if they are supported.
</li>
<li> If you use one of our standard Linux or FreeBSD
kernels, or started from our kernel configs, mark ipod.
<li> If you use one of our standard Linux, Fedora or
FreeBSD kernels, or started from our kernel
configs, mark ipod.
ipod is not supported on Windows XP.
</li>
<li> If it is based on one of our standard Linux,
<li> If it is based on one of our standard Linux, Fedora,
FreeBSD, or Windows XP images (or otherwise
sends its own ISUP notification), mark isup.
</li>
<li> If it is based on one of our standard Linux,
<li> If it is based on one of our standard Linux, Fedora,
FreeBSD, or Windows XP images, mark linktest.
</li>
</ul>
......@@ -646,8 +648,9 @@ function SPITFORM($formfields, $errors)
(Most images should use " . TBDB_DEFAULT_OSID_OPMODE . ")
<ul>
<li> If it is based on a testbed image (one of our
RedHat Linux or FreeBSD images) use the same
op_mode as that image. Select it from the
Linux, Fedora, FreeBSD, or Windows XP images)
use the same op_mode as that image.
Select it from the
<a href=\"$TBBASE/showosid_list.php3\"
>OS Descriptor List</a> to find out).
</li>
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002, 2004, 2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2002, 2004, 2005, 2006 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -178,7 +178,7 @@ echo " </select>
Guidelines for setting op_mode for your OS:
<ol>
<li> If it is based on a testbed image (one of our
RedHat Linux or FreeBSD images) use the same
Linux, Fedora, FreeBSD or Windows images) use the same
op_mode as that image. Select it from the
<a href=\"$TBBASE/showosid_list.php3\"
>OS Descriptor List</a> to find out).
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# All rights reserved.
#
# Stuff for OSIDs. All this stuff should come from the DB instead!
......@@ -10,6 +10,7 @@
# List of allowed OS types for creating OSIDs. The value is a user-okay flag.
$osid_oslist = array();
$osid_oslist["Linux"] = 1;
$osid_oslist["Fedora"] = 1;
$osid_oslist["FreeBSD"] = 1;
$osid_oslist["NetBSD"] = 1;
$osid_oslist["Windows"] = 1;
......@@ -42,6 +43,7 @@ define("TBDB_ALWAYSUP_OPMODE", "ALWAYSUP");
# Default OSID boot wait timeouts. User is not allowed to edit this.
$osid_reboot_waitlist = array();
$osid_reboot_waitlist["Linux"] = 120;
$osid_reboot_waitlist["Fedora"] = 120;
$osid_reboot_waitlist["FreeBSD"] = 120;
$osid_reboot_waitlist["NetBSD"] = 120;
$osid_reboot_waitlist["Windows"] = 240;
......
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