Commit 055bbb7c authored by Mike Hibler's avatar Mike Hibler

Define some additional configure vars in the clientside configure.

Against my better judgement, use configure to set some vars in clientside
scripts. I try to avoid this to keep our client images from becoming Utah
specific.

This is specifically for run_linktest.pl.in, which is installed on both
ops and nodes. I could fix it to not use configure vars on nodes, but that
would break its primary use on ops.

OTOH, I fixed elab_linktest.pl.in to not use configure variables, since
it only runs on nodes.
parent a090e8de
......@@ -716,6 +716,9 @@ CLIENT_ETCDIR
CLIENT_BINDIR
CLIENT_VARDIR
CLIENT_MANDIR
PROJROOT_DIR
EVENTSERVER
NOSHAREDFS
LOG_TESTBED
TBLOGFACIL
PYTHON
......@@ -4159,6 +4162,14 @@ CLIENT_BINDIR="/usr/local/etc/emulab"
CLIENT_VARDIR="/var/emulab"
CLIENT_MANDIR="/usr/local/man"
# XXX compat. We have no business expanding these on the client side!
PROJROOT_DIR="/proj"
EVENTSERVER="event-server"
NOSHAREDFS=0
TBLOGFACIL="local5"
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
cat >>confdefs.h <<_ACEOF
......
......@@ -83,6 +83,14 @@ CLIENT_BINDIR="/usr/local/etc/emulab"
CLIENT_VARDIR="/var/emulab"
CLIENT_MANDIR="/usr/local/man"
# XXX compat. We have no business expanding these on the client side!
AC_SUBST(PROJROOT_DIR)
AC_SUBST(EVENTSERVER)
AC_SUBST(NOSHAREDFS)
PROJROOT_DIR="/proj"
EVENTSERVER="event-server"
NOSHAREDFS=0
TBLOGFACIL="local5"
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
AC_DEFINE_UNQUOTED(LOG_TESTBED, $LOG_TESTBED)
......
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2010 University of Utah and the Flux Group.
# Copyright (c) 2010-2012 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -11,13 +11,20 @@ use strict;
$ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
# Drag in path stuff so we can find emulab stuff.
BEGIN { require "/etc/emulab/paths.pm"; import emulabpaths; }
use libsetup qw(getlocalevserver);
my $linktest = "@CLIENT_BINDIR@/linktest.pl";
my $evserver = getlocalevserver();
# XXX don't *even* pretend that we can change this
my $projdir = "/proj";
my @emulab_defaults = (
"PROJDIR=@PROJROOT_DIR@",
"PROJDIR=$projdir",
"VARDIR=@CLIENT_VARDIR@",
"BINDIR=@CLIENT_BINDIR@",
"EVENTSERVER=@EVENTSERVER@"
"EVENTSERVER=$evserver"
);
my $argString = join(" ", @emulab_defaults);
......
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