Commit e69e698c authored by Srikanth Raju's avatar Srikanth Raju Committed by Leigh Stoller

Do configure variable voodoo for temporary directory to scp into

parent 6a728f7d
......@@ -253,6 +253,7 @@ AC_SUBST(NODE_USAGE_SUPPORT)
AC_SUBST(NOSTACKMIB)
AC_SUBST(EXP_VIS_SUPPORT)
AC_SUBST(NOSHAREDFS)
AC_SUBST(IMPORT_TMPDIR)
AC_SUBST(SELFLOADER_DATA)
AC_SUBST(TBUSEDBI)
AC_SUBST(NEEDMCQUERIER)
......@@ -376,6 +377,7 @@ NODE_USAGE_SUPPORT=0
EXP_VIS_SUPPORT=0
NOSTACKMIB=0
NOSHAREDFS=0
IMPORT_TMPDIR="/q"
NFSRACY=1
SELFLOADER_DATA="__DATA__"
NEEDMCQUERIER=0
......
......@@ -47,20 +47,24 @@ $| = 1;
# Need this for predicates.
use libsetup;
#
# Configure variables
#
my $TB = "@prefix@";
my $IMPORT_BASE = "@IMPORT_TMPDIR@"
my $TB = "/usr/testbed";
#
# No configure vars.
#
my $WORK_BASE = "/q/import_temp/";
my $IN_BASE = "/q/indir/";
#TODO something in some script that creates these two directorieso
my $TAR = "tar";
my $sudo;
my $zipper = "/usr/local/bin/imagezip";
my $uploader = "/usr/local/etc/emulab/frisupload";
my $error = 0;
my $WORK_BASE = $IMPORT_BASE + "/import_temp/";
my $IN_BASE = $IMPORT_BASE + "/indir";
for my $path (qw#/usr/local/bin /usr/bin#) {
if (-e "$path/sudo") {
$sudo = "$path/sudo";
......
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