Commit b09e0ca9 authored by Kirk Webb's avatar Kirk Webb

Change the way PLAB_ROOTBALL is handled by autoconf - must now be specified in

the defs file when PLABSUPPORT=1 or an error is raised by configure.  Whenever
the official rootball name/version needs do be bumped, do so in defs-default.
You may track the defs-default rootball name in your defs file, or use your
own divergent name for testing.
parent 264bc5d7
......@@ -909,8 +909,8 @@ JAILIPMASK=255.240.0.0
IPBASE=10
SFSSUPPORT=1
PLABSUPPORT=0
PLAB_ROOTBALL="plabroot-9.tar.bz2"
PLAB_SLICEPREFIX="utah"
PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab"
TBLOGFACIL="local5"
LINKTEST_NSPATH="/share/linktest-ns"
......@@ -1003,6 +1003,12 @@ EOF
fi
if test $PLABSUPPORT -eq 1; then
if test "$PLAB_ROOTBALL" = "change.me"; then
{ echo "configure: error: plab support included but PLAB_ROOTBALL not defined." 1>&2; exit 1; }
fi
fi
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
cat >> confdefs.h <<EOF
#define LOG_TESTBED $LOG_TESTBED
......@@ -1307,7 +1313,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1311: checking for a BSD compatible install" >&5
echo "configure:1317: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......
......@@ -101,8 +101,8 @@ JAILIPMASK=255.240.0.0
IPBASE=10
SFSSUPPORT=1
PLABSUPPORT=0
PLAB_ROOTBALL="plabroot-9.tar.bz2"
PLAB_SLICEPREFIX="utah"
PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab"
TBLOGFACIL="local5"
LINKTEST_NSPATH="/share/linktest-ns"
......@@ -151,6 +151,12 @@ if test -n "$FSDIR_SHARE"; then
AC_DEFINE_UNQUOTED(FSDIR_SHARE, "$FSDIR_SHARE")
fi
if test $PLABSUPPORT -eq 1; then
if test "$PLAB_ROOTBALL" = "change.me"; then
AC_MSG_ERROR([plab support included but PLAB_ROOTBALL not defined.])
fi
fi
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
AC_DEFINE_UNQUOTED(LOG_TESTBED, $LOG_TESTBED)
AC_SUBST(LOG_TESTBED)
......
......@@ -33,4 +33,4 @@ WWWHOST=www.emulab.net
TBMAINSITE=1
THISHOMEBASE=Emulab.Net
PLABSUPPORT=1
PLAB_SLICEPREFIX=utah
PLAB_ROOTBALL="plabroot-10.tar.bz2"
......@@ -20,3 +20,4 @@ WWWHOST=www.emulab.net
WWW=www.emulab.net/dev/kwebb
FS_WITH_QUOTAS="/q /users"
PLABSUPPORT=1
PLAB_ROOTBALL="plabroot-kwebb.tar.bz2"
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