Commit cafbb325 authored by Leigh B. Stoller's avatar Leigh B. Stoller

I (finally) have an Elabinelab hack that is too ugly to leave in unless

its an inner elab. Define ELABINELAB in the inner defs file. Actual hack
is coming in a bit.
parent 3afcab05
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#undef FSDIR_USERS #undef FSDIR_USERS
#undef FSDIR_SHARE #undef FSDIR_SHARE
#undef SFSSUPPORT #undef SFSSUPPORT
#undef ELABINELAB
#undef LOG_TESTBED #undef LOG_TESTBED
#undef EVENTSERVER #undef EVENTSERVER
#undef BOSSEVENTPORT #undef BOSSEVENTPORT
...@@ -891,6 +891,7 @@ fi ...@@ -891,6 +891,7 @@ fi
# #
...@@ -932,6 +933,7 @@ JAILIPBASE=172.17.0.0 ...@@ -932,6 +933,7 @@ JAILIPBASE=172.17.0.0
JAILIPMASK=255.240.0.0 JAILIPMASK=255.240.0.0
IPBASE=10 IPBASE=10
SFSSUPPORT=1 SFSSUPPORT=1
ELABINELAB=0
PLABSUPPORT=0 PLABSUPPORT=0
PLAB_ROOTBALL="change.me" PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab" PLAB_SLICEPREFIX="utah_elab"
...@@ -1393,7 +1395,7 @@ fi ...@@ -1393,7 +1395,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./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 $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1397: checking for a BSD compatible install" >&5 echo "configure:1399: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1543,7 +1545,6 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -1543,7 +1545,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
tmcd/linux9/GNUmakefile tmcd/linux9/supfile \ tmcd/linux9/GNUmakefile tmcd/linux9/supfile \
tmcd/freebsd5/GNUmakefile tmcd/freebsd5/supfile \ tmcd/freebsd5/GNUmakefile tmcd/freebsd5/supfile \
tmcd/openbsd/GNUmakefile tmcd/ron/GNUmakefile tmcd/plab/GNUmakefile \ tmcd/openbsd/GNUmakefile tmcd/ron/GNUmakefile tmcd/plab/GNUmakefile \
tmcd/cygwinxp/GNUmakefile \
utils/GNUmakefile utils/vlandiff utils/vlansync utils/delay_config \ utils/GNUmakefile utils/vlandiff utils/vlansync utils/delay_config \
utils/sshtb utils/create_image utils/node_admin utils/webcreateimage \ utils/sshtb utils/create_image utils/node_admin utils/webcreateimage \
utils/firstuser utils/export_tables utils/eventping \ utils/firstuser utils/export_tables utils/eventping \
...@@ -1770,6 +1771,7 @@ s%@TBAUTHDOMAIN@%$TBAUTHDOMAIN%g ...@@ -1770,6 +1771,7 @@ s%@TBAUTHDOMAIN@%$TBAUTHDOMAIN%g
s%@TBAUTHTIMEOUT@%$TBAUTHTIMEOUT%g s%@TBAUTHTIMEOUT@%$TBAUTHTIMEOUT%g
s%@TBMAINSITE@%$TBMAINSITE%g s%@TBMAINSITE@%$TBMAINSITE%g
s%@SFSSUPPORT@%$SFSSUPPORT%g s%@SFSSUPPORT@%$SFSSUPPORT%g
s%@ELABINELAB@%$ELABINELAB%g
s%@PLABSUPPORT@%$PLABSUPPORT%g s%@PLABSUPPORT@%$PLABSUPPORT%g
s%@TBLOGFACIL@%$TBLOGFACIL%g s%@TBLOGFACIL@%$TBLOGFACIL%g
s%@PLAB_ROOTBALL@%$PLAB_ROOTBALL%g s%@PLAB_ROOTBALL@%$PLAB_ROOTBALL%g
......
...@@ -60,6 +60,7 @@ AC_SUBST(TBAUTHDOMAIN) ...@@ -60,6 +60,7 @@ AC_SUBST(TBAUTHDOMAIN)
AC_SUBST(TBAUTHTIMEOUT) AC_SUBST(TBAUTHTIMEOUT)
AC_SUBST(TBMAINSITE) AC_SUBST(TBMAINSITE)
AC_SUBST(SFSSUPPORT) AC_SUBST(SFSSUPPORT)
AC_SUBST(ELABINELAB)
AC_SUBST(PLABSUPPORT) AC_SUBST(PLABSUPPORT)
AC_SUBST(TBLOGFACIL) AC_SUBST(TBLOGFACIL)
AC_SUBST(PLAB_ROOTBALL) AC_SUBST(PLAB_ROOTBALL)
...@@ -124,6 +125,7 @@ JAILIPBASE=172.17.0.0 ...@@ -124,6 +125,7 @@ JAILIPBASE=172.17.0.0
JAILIPMASK=255.240.0.0 JAILIPMASK=255.240.0.0
IPBASE=10 IPBASE=10
SFSSUPPORT=1 SFSSUPPORT=1
ELABINELAB=0
PLABSUPPORT=0 PLABSUPPORT=0
PLAB_ROOTBALL="change.me" PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab" PLAB_SLICEPREFIX="utah_elab"
......
...@@ -33,6 +33,8 @@ THISHOMEBASE=changeme ...@@ -33,6 +33,8 @@ THISHOMEBASE=changeme
PLABSUPPORT=0 PLABSUPPORT=0
SFSSUPPORT=0 SFSSUPPORT=0
DISABLE_NSE=1 DISABLE_NSE=1
# This means it is an inner elab!
ELABINELAB=1
# #
# Network config stuff. Used to generate initial named and dhcpd config files. # Network config stuff. Used to generate initial named and dhcpd config files.
# #
......
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