Commit b322a14e authored by Leigh Stoller's avatar Leigh Stoller

Kill off some obsolete GENIRACK stuff.

parent efd89a43
...@@ -66,7 +66,6 @@ my $OS_SELECT = "$TB/bin/os_select"; ...@@ -66,7 +66,6 @@ my $OS_SELECT = "$TB/bin/os_select";
my $DELAYCAPACITY = @DELAYCAPACITY@; # Can be overridden by user. my $DELAYCAPACITY = @DELAYCAPACITY@; # Can be overridden by user.
my $DELAYTHRESH = @DELAYTHRESH@; my $DELAYTHRESH = @DELAYTHRESH@;
my $PGENISUPPORT = @PROTOGENI_SUPPORT@; my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $PGENIRACK = @PROTOGENI_GENIRACK@;
my $OURDOMAIN = "@OURDOMAIN@"; my $OURDOMAIN = "@OURDOMAIN@";
my $MAINSITE = @TBMAINSITE@; my $MAINSITE = @TBMAINSITE@;
my $mycmurn = ""; my $mycmurn = "";
......
...@@ -66,7 +66,6 @@ my $OS_SELECT = "$TB/bin/os_select"; ...@@ -66,7 +66,6 @@ my $OS_SELECT = "$TB/bin/os_select";
my $DELAYCAPACITY = @DELAYCAPACITY@; # Can be overridden by user. my $DELAYCAPACITY = @DELAYCAPACITY@; # Can be overridden by user.
my $DELAYTHRESH = @DELAYTHRESH@; my $DELAYTHRESH = @DELAYTHRESH@;
my $PGENISUPPORT = @PROTOGENI_SUPPORT@; my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $PGENIRACK = @PROTOGENI_GENIRACK@;
my $OURDOMAIN = "@OURDOMAIN@"; my $OURDOMAIN = "@OURDOMAIN@";
my $MAINSITE = @TBMAINSITE@; my $MAINSITE = @TBMAINSITE@;
my $mycmurn = ""; my $mycmurn = "";
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2010-2017 University of Utah and the Flux Group. # Copyright (c) 2010-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -25,18 +25,10 @@ use English; ...@@ -25,18 +25,10 @@ use English;
use strict; use strict;
use Getopt::Std; use Getopt::Std;
#
# Mark an image as running on XEN.
#
my $PROTOGENI_GENIRACK = @PROTOGENI_GENIRACK@;
# #
# Mark an image as running on XEN. # Mark an image as running on XEN.
# #
my @OTHER_PARENTS = ("XEN44-64-STD", "XEN46-64-STD"); my @OTHER_PARENTS = ("XEN44-64-STD", "XEN46-64-STD");
if ($PROTOGENI_GENIRACK) {
push(@OTHER_PARENTS, "XEN44-64-GENIRACK");
}
sub usage() sub usage()
{ {
......
<?php <?php
# #
# Copyright (c) 2000-2017 University of Utah and the Flux Group. # Copyright (c) 2000-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -125,10 +125,6 @@ elseif ($type == "webfreeze") { ...@@ -125,10 +125,6 @@ elseif ($type == "webfreeze") {
$target_user->SetWebFreeze($value); $target_user->SetWebFreeze($value);
} }
elseif ($type == "adminflag") { elseif ($type == "adminflag") {
# This is active on geni racks only.
if (0 && !$GENIRACK) {
USERERROR("This toggle is disabled on non-geni racks!", 1);
}
# must be admin # must be admin
if (! $isadmin) { if (! $isadmin) {
USERERROR("You do not have permission to toggle $type!", 1); USERERROR("You do not have permission to toggle $type!", 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