Commit 034f8c40 authored by Leigh B Stoller's avatar Leigh B Stoller

More fixes for cloning ec2 images.

parent 59644b10
<?php
#
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -199,7 +199,7 @@ function SPITFORM($formfields, $errors)
global $TBDB_OSID_OSNAMELEN, $TBDB_NODEIDLEN;
global $TBDB_OSID_VERSLEN, $TBBASE, $TBPROJ_DIR, $TBGROUP_DIR;
global $WIKIDOCURL;
global $view, $ec2;
global $view, $ec2, $baseimage;
#
# Explanation of the $view argument: used to turn on and off display of
......@@ -319,7 +319,12 @@ function SPITFORM($formfields, $errors)
if ($ec2) {
echo "<input type=hidden name=ec2 value=true>";
}
if (isset($baseimage)) {
$id = $baseimage->imageid();
$version = $baseimage->version();
echo "<input type=hidden name=baseimage value='$id'>";
echo "<input type=hidden name=version value='$version'>";
}
#
# Select Project
#
......@@ -1392,6 +1397,12 @@ if (!isset($confirmed) && 0 != strcmp($confirmationWarning,"")) {
if ($ec2) {
echo "<input type=hidden name=ec2 value=true>";
}
if (isset($baseimage)) {
$id = $baseimage->imageid();
$version = $baseimage->version();
echo "<input type=hidden name=baseimage value='$id'>";
echo "<input type=hidden name=version value='$version'>";
}
echo "</form></center>";
PAGEFOOTER();
......
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