Commit 946585ed authored by Leigh B Stoller's avatar Leigh B Stoller

Switch to XEN42-64-STD but fall back to XEN41 image.

parent 5e576901
...@@ -889,8 +889,10 @@ class Image ...@@ -889,8 +889,10 @@ class Image
if ($does) { if ($does) {
$parentosinfo = OSinfo::LookupByName("emulab-ops", $parentosinfo = OSinfo::LookupByName("emulab-ops",
"XEN41-64-STD"); "XEN43-64-STD");
if (!$parentosinfo) { if (!$parentosinfo) {
$parentosinfo = OSinfo::LookupByName("emulab-ops",
"XEN41-64-STD");
return -1; return -1;
} }
$parentosid = $parentosinfo->osid(); $parentosid = $parentosinfo->osid();
......
...@@ -1004,9 +1004,11 @@ if (!isset($submit)) { ...@@ -1004,9 +1004,11 @@ if (!isset($submit)) {
# #
# XXX Need to fix this. # XXX Need to fix this.
# #
$def_parentosinfo = OSinfo::LookupByName("emulab-ops", "XEN41-64-STD"); $def_parentosinfo = OSinfo::LookupByName("emulab-ops", "XEN43-64-STD");
if (! $def_parentosinfo) { if (! $def_parentosinfo) {
TBERROR("Could not lookup osinfo object for XEN41-64-STD", 1); $def_parentosinfo = OSinfo::LookupByName("emulab-ops",
"XEN41-64-STD");
TBERROR("Could not lookup osinfo object for XEN image", 1);
} }
$defaults["def_parentosid"] = $def_parentosinfo->osid(); $defaults["def_parentosid"] = $def_parentosinfo->osid();
......
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