New defs variable - FSNODE . Should contain the name of the site's

fileserver - ie. fs.emulab.net . tmcd and exports_setup now use this
variable rather than a hard-coded node name.

Makeconf.in

@@ -19,6 +19,7 @@ TBOPSEMAIL	= @TBOPSEMAIL@
 TBLOGSEMAIL	= @TBLOGSEMAIL@
 BOSSNODE        = @BOSSNODE@
 USERNODE        = @USERNODE@
+FSNODE          = @FSNODE@
 OURDOMAIN       = @OURDOMAIN@
 CPPFLAGS	= @CPPFLAGS@
 CFLAGS	       += @CFLAGS@

configure

@@ -816,6 +816,7 @@ fi
 
 
 
+
 #
 # Okay, I know this is improper usage of --with. Too bad.
 #
@@ -979,7 +980,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:983: checking for a BSD compatible install" >&5
+echo "configure:984: 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
@@ -1262,6 +1263,7 @@ s%@DELAYCAPACITY@%$DELAYCAPACITY%g
 s%@IPBASE@%$IPBASE%g
 s%@BOSSNODE@%$BOSSNODE%g
 s%@USERNODE@%$USERNODE%g
+s%@FSNODE@%$FSNODE%g
 s%@OURDOMAIN@%$OURDOMAIN%g
 s%@LEDA@%$LEDA%g
 s%@SSH_ARGS@%$SSH_ARGS%g

configure.in

@@ -23,6 +23,7 @@ AC_SUBST(DELAYCAPACITY)
 AC_SUBST(IPBASE)
 AC_SUBST(BOSSNODE)
 AC_SUBST(USERNODE)
+AC_SUBST(FSNODE)
 AC_SUBST(OURDOMAIN)
 
 #

defs-calfeld-emulab

@@ -12,4 +12,5 @@ IPBASE=192.168
 DELAYCAPACITY=2
 BOSSNODE=boss.emulab.net
 USERNODE=users.emulab.net
+FSNODE=fs.emulab.net
 OURDOMAIN=emulab.net

defs-default

@@ -12,4 +12,5 @@ IPBASE=192.168
 DELAYCAPACITY=2
 BOSSNODE=boss.emulab.net
 USERNODE=users.emulab.net
+FSNODE=fs.emulab.net
 OURDOMAIN=emulab.net

defs-mini

@@ -12,4 +12,5 @@ IPBASE=192.168
 DELAYCAPACITY=2
 BOSSNODE=boss.mini.emulab.net
 USERNODE=users.mini.emulab.net
+FSNODE=fs.mini.emulab.net
 OURDOMAIN=mini.emulab.net

defs-neo-paper

@@ -7,4 +7,5 @@ TBOPSEMAIL='Testbed Operations <testbed-ops@flux.cs.utah.edu>'
 TBLOGSEMAIL=testbed-logs@flux.cs.utah.edu
 BOSSNODE=boss.emulab.net
 USERNODE=users.emulab.net
+FSNODE=fs.emulab.net
 OURDOMAIN=emulab.net

defs-newbold-emulab

@@ -9,4 +9,5 @@ IPBASE=192.168
 DELAYCAPACITY=2
 BOSSNODE=boss.emulab.net
 USERNODE=users.emulab.net
+FSNODE=fs.emulab.net
 OURDOMAIN=emulab.net

defs-ricci-emulab

@@ -7,6 +7,7 @@ TBOPSEMAIL=ricci@cs.utah.edu
 TBLOGSEMAIL=ricci@cs.utah.edu
 BOSSNODE=boss.emulab.net
 USERNODE=users.emulab.net
+FSNODE=fs.emulab.net
 OURDOMAIN=emulab.net
 DELAYCAPACITY=2
 IPBASE=192.168

defs-ricci-neo-paper

@@ -7,4 +7,5 @@ TBOPSEMAIL=ricci@cs.utah.edu
 TBLOGSEMAIL=ricci@cs.utah.edu
 BOSSNODE=boss.emulab.net
 USERNODE=users.emulab.net
+FSNODE=fs.emulab.net
 OURDOMAIN=emulab.net

defs-stoller-emulab

@@ -9,4 +9,5 @@ IPBASE=192.168
 DELAYCAPACITY=2
 BOSSNODE=boss.emulab.net
 USERNODE=users.emulab.net
+FSNODE=fs.emulab.net
 OURDOMAIN=emulab.net

defs-stoller-home

@@ -9,5 +9,6 @@ IPBASE=192.168
 DELAYCAPACITY=2
 BOSSNODE=stoller.casco.net
 USERNODE=stoller.casco.net
+FSNODE=fs.casco.net
 MYDOMAIN=casco.net
 

tbsetup/exports_setup.in

@@ -18,9 +18,10 @@ use Fcntl ':flock';
 my $TB		= "@prefix@";
 my $TBOPS       = "@TBOPSEMAIL@";
 my $TESTMODE    = @TESTMODE@;
+my $FSNODE      = "@FSNODE@";
 
 # Note no -n option. We redirect stdin from the new exports file below.
-my $SSH		= "$TB/bin/sshtb -l root fs.emulab.net";
+my $SSH		= "$TB/bin/sshtb -l root $FSNODE";
 my $PROG	= "/usr/testbed/sbin/exports_setup.proxy";
 my $exportstail = "/var/tmp/exports.tail";
 my $lockfile    = "/var/tmp/testbed_exports_lockfile";

tmcd/GNUmakefile.in

@@ -12,7 +12,8 @@ all:	tmcd tmcc tmcd.restart findif
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
-CFLAGS	+= -O -g -DUDP -DTBDBNAME='"$(TBDBNAME)"' -I/usr/local/include
+CFLAGS	+= -O -g -DUDP -DTBDBNAME='"$(TBDBNAME)"' -I/usr/local/include \
+	-DFSNODE='"$(FSNODE)"'
 
 tmcd: tmcd.o
 	$(CC) $(CFLAGS) -o tmcd tmcd.o \

tmcd/tmcd.c

@@ -17,9 +17,9 @@
 /*
  * XXX This needs to be localized!
  */
-#define FSPROJDIR	"fs.emulab.net:/q/proj"
-#define FSGROUPDIR	"fs.emulab.net:/q/groups"
-#define FSUSERDIR	"fs.emulab.net:/users"
+#define FSPROJDIR	FSNODE ":/q/proj"
+#define FSGROUPDIR	FSNODE ":/q/groups"
+#define FSUSERDIR	FSNODE ":/users"
 #define PROJDIR		"/proj"
 #define GROUPDIR	"/groups"
 #define USERDIR		"/users"