Commit 9fcd7030 authored by Leigh Stoller's avatar Leigh Stoller

Call create-xen-image on XEN host, which is argument compatible. This

retains backwards compatibility with old XEN client sides, so that
create_image can continue to call create-image, as it will on server sides
that have not yet been updated.
parent 5f73e1dc
#!/usr/bin/perl -wT
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
......@@ -53,6 +53,7 @@ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
my $sudo = "";
my $zipper = "/usr/local/bin/imagezip";
my $uploader = "/usr/local/bin/frisupload";
my $xenscript = "/usr/local/bin/create-xen-image";
my $slice = "";
my $device;
my $filename;
......@@ -69,6 +70,19 @@ if ($EUID != 0) {
}
}
#
# A newer server side is going to invoke this script for XEN nodes, to be
# backwards compatible with older XEN client sides that had its own version
# of create-image. It is now called create-xen-image, so call that script,
# which conveniently is argument compatible with this script. This test for
# the file is kinda bogus, but this script does not include libsetup, which
# hides that. Not sure why we do not include libsetup (ask Mike).
#
if ($^O eq 'linux' && -e "/etc/emulab/genvmtype") {
exec $xenscript, @ARGV;
die("Could not exec $xenscript");
}
# Frisbee master server params
my $iserver = "boss"; # XXX
my $imageid;
......
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