Commit 37c96c02 authored by Leigh Stoller's avatar Leigh Stoller

Get rid of ImageDirectories feature test, we are committed.

parent 5ddaa6b6
......@@ -86,7 +86,6 @@ my $NEWIMAGEEZ = "$TB/bin/newimageid_ez";
my $DOPROVENANCE = @IMAGEPROVENANCE@;
my $DOIMAGEDIRS = @IMAGEDIRECTORIES@;
my $doprovenance = $DOPROVENANCE;
my $doimagedirs = $DOIMAGEDIRS;
#
# Untaint the path
......@@ -250,15 +249,6 @@ if ($DOPROVENANCE) {
}
}
# See if enabled.
if ($DOIMAGEDIRS) {
# But allow feature override.
if (EmulabFeatures->Lookup("ImageDirectories")) {
$doimagedirs =
EmulabFeatures->FeatureEnabled("ImageDirectories", undef, $group);
}
}
#
# The simple case is that the descriptor already exists. So it is just
# a simple snapshot to the image file.
......@@ -476,7 +466,7 @@ if (Image->LookupByName($imagename) && !$this_user->IsAdmin()) {
my $path = ($experiment->pid() eq $experiment->gid() || $global ?
"$PROJROOT/$pid/images/" :
"$GROUPROOT/$pid/$gid/images/");
if ($doimagedirs) {
if ($DOIMAGEDIRS) {
$path .= "${imagename}/";
}
else {
......
#!/usr/bin/perl -w
#
# Copyright (c) 2010-2016 University of Utah and the Flux Group.
# Copyright (c) 2010-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -87,7 +87,6 @@ my $DOIMAGEDIRS = @IMAGEDIRECTORIES@;
my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
my $doprovenance = $WITHPROVENANCE;
my $dodeltas = $WITHDELTAS;
my $doimagedirs = $DOIMAGEDIRS;
#
# When fetching the metadata, we now tell the server what client
......@@ -350,13 +349,6 @@ if ($WITHPROVENANCE) {
if (!$doprovenance && $getallimages) {
fatal("-G option requires IMAGE_PROVENANCE to be enabled");
}
if ($DOIMAGEDIRS) {
# But allow feature override.
if (EmulabFeatures->Lookup("ImageDirectories")) {
$doimagedirs =
EmulabFeatures->FeatureEnabled("ImageDirectories", undef, $group);
}
}
#
# Need to watch for two experiments causing this image to
......@@ -896,7 +888,7 @@ sub CreateImage($$$$$)
$xmlparse->{'attribute'}->{"path"}->{'value'} =
"$TBPROJ_DIR/" . $group->pid() . "/" . $group->gid() . "/images/";
}
if ($doimagedirs) {
if ($DOIMAGEDIRS) {
$xmlparse->{'attribute'}->{"path"}->{'value'} .= "${imagename}/";
}
else {
......
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