Commit 099f7993 authored by Leigh Stoller's avatar Leigh Stoller

Change path to frisupload, actually look in both places.

parent b61dbd0a
......@@ -30,7 +30,8 @@ BEGIN { require "/etc/emulab/paths.pm"; import emulabpaths; }
my $VIMAGE = "/usr/local/bin/create-versioned-image";
my $zipper = "/usr/local/bin/imagezip";
my $uploader = "/usr/local/bin/frisupload";
my $uploader = "$BINDIR/frisupload";
my $uploader_alt= "/usr/local/bin/frisupload";
my $VNODESETUP = "$BINDIR/vnodesetup";
my $CAPTURE = "$BINDIR/capturevm.pl";
my $EXTRAFS = "/capture";
......@@ -66,6 +67,10 @@ use libsetup;
use libvnode_xen;
use libutil;
# Location confusion.
$uploader = $uploader_alt
if (! -x $uploader);
#
# No configure vars.
#
......
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