Commit 3ba1bd2c authored by Leigh Stoller's avatar Leigh Stoller

Fix a couple of silly bugs in clone.

parent bdf982bd
......@@ -471,7 +471,7 @@ function Do_Clone()
{
global $this_user, $ajax_args;
global $TBBASE, $ISEMULAB, $TBMAINSITE, $OURDOMAIN;
global $TB_PROJECT_MAKEIMAGEID, $TB_NODEACCESS_LOADIMAGE; $suexec_output;
global $TB_PROJECT_MAKEIMAGEID, $TB_NODEACCESS_LOADIMAGE, $suexec_output;
global $TB_IMAGEID_MODIFYINFO, $TB_IMAGEID_READINFO;
$this_idx = $this_user->uid_idx();
......@@ -622,11 +622,13 @@ function Do_Clone()
}
$args["noexport"] = $baseimage->noexport();
$args["mbr_version"] = $baseimage->mbr_version();
$args["reboot_waittime"] = $baseinfo->reboot_waittime();
$args["osfeatures"] = $baseinfo->osfeatures();
if ($baseimage->architecture()) {
$args["architecture"] = $baseimage->architecture();
}
if ($baseinfo->reboot_waittime() && $baseinfo->reboot_waittime() != "") {
$args["reboot_waittime"] = $baseinfo->reboot_waittime();
}
# Send the type array anyway.
foreach ($baseimage->Types() as $type) {
$args["mtype_$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