The latest image build. Changes to the freebsd/linux tmcc setup

files to support cvsup. Some cleanup of the password and group files.

configure

@@ -934,11 +934,12 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	tbsetup/ir/GNUmakefile tbsetup/ir/postassign tbsetup/snmpit \
 	tbsetup/ir/assign_wrapper tbsetup/ns2ir/GNUmakefile \
 	tbsetup/ns2ir/postparse tbsetup/ir/handle_os tbsetup/ir/handle_ip \
-	tbsetup/ns2ir/parse.tcl \
+	tbsetup/ns2ir/parse.tcl tbsetup/savevlans \
 	tbsetup/tbprerun tbsetup/tbrun tbsetup/tbend tbsetup/tbreport \
 	tbsetup/checkpass/GNUmakefile \
 	tip/GNUmakefile \
-	tmcd/GNUmakefile tmcd/tmcd.restart \
+	tmcd/GNUmakefile tmcd/freebsd/GNUmakefile tmcd/linux/GNUmakefile \
+	tmcd/tmcd.restart \
 	www/GNUmakefile www/defs.php3 www/dbdefs.php3"
 
 #

configure.in

@@ -104,7 +104,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	tbsetup/tbprerun tbsetup/tbrun tbsetup/tbend tbsetup/tbreport \
 	tbsetup/checkpass/GNUmakefile \
 	tip/GNUmakefile \
-	tmcd/GNUmakefile tmcd/tmcd.restart \
+	tmcd/GNUmakefile tmcd/freebsd/GNUmakefile tmcd/linux/GNUmakefile \
+	tmcd/tmcd.restart \
 	www/GNUmakefile www/defs.php3 www/dbdefs.php3"
 
 #

doc/nextimage.txt

-* Mike's dhcp fix: plastic:/sbin/dhclient-script

os/split-image.sh

+#!/bin/sh
+
+#
+# Split up an image and imagezip it. Beware, the sector offsets and sizes
+# are hardcoded in here.
+#
+
+image=wd0
+zip=imagezip
+
+#
+# Boot block: start 0, size 63
+# 
+dd if=$image of=${image}-mbr bs=1b count=63
+$zip ${image}-mbr ${image}-mbr.ndz
+
+#
+# So, who picked these sizes? Da ya think maybe we could pick sizes
+# that are nicely divisible by 32k or 64k, instead of an odd number?
+# 
+
+#
+# FreeBSD: start 63, size 6281352
+# 
+dd if=$image of=${image}-fbsd ibs=1b skip=63 obs=1b count=6281352
+$zip ${image}-fbsd ${image}-fbsd.ndz
+
+#
+# Linux: start 6281415, size 6281415
+# 
+dd if=$image of=${image}-rhat ibs=1b skip=6281415 obs=1b count=6281415
+$zip ${image}-rhat ${image}-rhat.ndz
+
+$zip $image $image-all.ndz

tmcd/freebsd/GNUmakefile → tmcd/freebsd/GNUmakefile.in

@@ -5,13 +5,30 @@
 # on a testbed node before cutting an image.
 #
 #
+SRCDIR		= @srcdir@
+TESTBED_SRCDIR	= @top_srcdir@
+OBJDIR		= ../..
+SUBDIR		= tmcd
+
+include $(OBJDIR)/Makeconf
+
+all:
+
+include $(TESTBED_SRCDIR)/GNUmakerules
+
 INSTALL_DIR	= /etc/testbed
 INSTALL_FILES	= group master.passwd setup
 INSTALL		= /usr/bin/install -c 
 
 install:
-	-mkdir -p $(INSTALL_DIR)
-	$(INSTALL) -m 644 group $(INSTALL_DIR)/group
-	$(INSTALL) -m 600 master.passwd $(INSTALL_DIR)/master.passwd
-	$(INSTALL) -m 755 setup $(INSTALL_DIR)/setup
+	-mkdir -p 
+	-rm -rf $(INSTALL_DIR)/sup/sup
+	-mkdir -p $(INSTALL_DIR)/sup
+	$(INSTALL) -m 644 $(SRCDIR)/group $(INSTALL_DIR)/group
+	$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(INSTALL_DIR)/master.passwd
+	$(INSTALL) -m 755 $(SRCDIR)/setup $(INSTALL_DIR)/setup
+	$(INSTALL) -m 755 $(SRCDIR)/rc.testbed $(INSTALL_DIR)/rc.testbed
 	$(INSTALL) -m 755 ../tmcc $(INSTALL_DIR)/tmcc
+	$(INSTALL) -m 755 $(SRCDIR)/supfile $(INSTALL_DIR)/supfile
+	-mkdir -p /root/.cvsup
+	$(INSTALL) -m 600 $(SRCDIR)/cvsup.auth /root/.cvsup/auth

tmcd/freebsd/cvsup.auth

+paper.emulab.net:root@any.emulab.net:NoStinkingPassword:

tmcd/freebsd/group

@@ -18,5 +18,6 @@ uucp:*:66:
 xten:*:67:xten
 dialer:*:68:
 network:*:69:
+testbed:*:6000:
 nogroup:*:65533:
 nobody:*:65534:

tmcd/freebsd/master.passwd

@@ -13,14 +13,13 @@ uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucic
 xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/sbin/nologin
 pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/sbin/nologin
-lepreau:XzOQ6qRSyDp5A:12:10::0:0:Jay Lepreau:/users/lepreau:/bin/csh
-mike:OQYay0WnwMYTs:27:10::0:0:Mike Hibler:/users/mike:/bin/csh
-stoller:4.MMzSPURcOls:282:10::0:0:Leigh B. Stoller:/users/stoller:/bin/csh
-tullmann:slG0cJEVIV7fk:3654:101::0:0:Patrick A Tullmann:/users/tullmann:/bin/tcsh
-calfeld:amGW2iuQCjmyQ:2986:101::0:0:Chris Alfeld:/users/calfeld:/bin/tcsh
-danderse:i7zCwgOeDkwZ6:2146:601::0:0:David G Andersen:/users/danderse:/bin/tcsh
-kwright:LOBUwwa97jn36:1025:101::0:0:Kristin Wright:/users/kwright:/bin/tcsh
-reid:i9vTbxvJp1Rpo:1296:101::0:0:Alastair Reid,,,:/users/reid:/bin/tcsh
-newbold:b5CNBeTTiXYqA:2224:110::0:0:Mac G Newbold:/users/newbold:/bin/tcsh
-axon:MAg80zUaZS52Q:2347:110::0:0:Logan Axon:/users/axon:/bin/tcsh
-ricci:3MYM/vEONbd8k:1182:110::0:0:Robert Ricci:/users/ricci:/bin/tcsh
+lepreau:XzOQ6qRSyDp5A:12:6000::0:0:Jay Lepreau:/users/lepreau:/bin/csh
+mike:OQYay0WnwMYTs:27:6000::0:0:Mike Hibler:/users/mike:/bin/csh
+stoller:4.MMzSPURcOls:282:6000::0:0:Leigh B. Stoller:/users/stoller:/bin/csh
+tullmann:slG0cJEVIV7fk:3654:6000::0:0:Patrick A Tullmann:/users/tullmann:/bin/tcsh
+calfeld:amGW2iuQCjmyQ:2986:6000::0:0:Chris Alfeld:/users/calfeld:/bin/tcsh
+danderse:i7zCwgOeDkwZ6:2146:6000::0:0:David G Andersen:/users/danderse:/bin/tcsh
+reid:i9vTbxvJp1Rpo:1296:6000::0:0:Alastair Reid,,,:/users/reid:/bin/tcsh
+newbold:b5CNBeTTiXYqA:2224:6000::0:0:Mac G Newbold:/users/newbold:/bin/tcsh
+axon:MAg80zUaZS52Q:2347:6000::0:0:Logan Axon:/users/axon:/bin/tcsh
+ricci:3MYM/vEONbd8k:1182:6000::0:0:Robert Ricci:/users/ricci:/bin/tcsh

tmcd/freebsd/rc.testbed

+#!/bin/sh
+
+echo "Checking for file updates ..."
+export HOME=/root
+/usr/local/bin/cvsup -1 -g -L 1 /etc/testbed/supfile
+
+if [ -x /etc/testbed/setup ]; then
+        echo "Setting up Testbed configuration..."
+        /etc/testbed/setup
+fi
+
+if [ -x /etc/testbed/rc.ifc ]; then
+        echo "Setting up Testbed interfaces..."
+        /etc/testbed/rc.ifc
+fi
+
+if [ -x /etc/testbed/rc.delay ]; then
+        echo "Setting up Testbed delay configuration..."
+        /etc/testbed/rc.delay
+fi
+

tmcd/freebsd/supfile

+FBSD40-STD host=boss.emulab.net base=/etc/testbed/sup prefix=/ preserve delete release=current
+

tmcd/linux/GNUmakefile → tmcd/linux/GNUmakefile.in

@@ -5,16 +5,32 @@
 # on a testbed node before cutting an image.
 #
 #
+SRCDIR		= @srcdir@
+TESTBED_SRCDIR	= @top_srcdir@
+OBJDIR		= ../..
+SUBDIR		= tmcd
+
+include $(OBJDIR)/Makeconf
+
+all:
+
+include $(TESTBED_SRCDIR)/GNUmakerules
+
 INSTALL_DIR	= /etc/rc.d/testbed
 INSTALL_FILES	= group gshadow passwd rc.testbed setup shadow
 INSTALL		= /usr/bin/install -c 
 
 install:
 	-mkdir -p $(INSTALL_DIR)
-	$(INSTALL) -m 644 group $(INSTALL_DIR)/group
-	$(INSTALL) -m 644 passwd $(INSTALL_DIR)/passwd
-	$(INSTALL) -m 600 shadow $(INSTALL_DIR)/shadow
-	$(INSTALL) -m 600 gshadow $(INSTALL_DIR)/gshadow
-	$(INSTALL) -m 755 rc.testbed $(INSTALL_DIR)/rc.testbed
-	$(INSTALL) -m 755 setup $(INSTALL_DIR)/setup
+	-rm -rf $(INSTALL_DIR)/sup/sup
+	-mkdir -p $(INSTALL_DIR)/sup
+	$(INSTALL) -m 644 $(SRCDIR)/group $(INSTALL_DIR)/group
+	$(INSTALL) -m 644 $(SRCDIR)/passwd $(INSTALL_DIR)/passwd
+	$(INSTALL) -m 600 $(SRCDIR)/shadow $(INSTALL_DIR)/shadow
+	$(INSTALL) -m 600 $(SRCDIR)/gshadow $(INSTALL_DIR)/gshadow
+	$(INSTALL) -m 755 $(SRCDIR)/rc.testbed $(INSTALL_DIR)/rc.testbed
+	$(INSTALL) -m 755 $(SRCDIR)/setup $(INSTALL_DIR)/setup
 	$(INSTALL) -m 755 ../tmcc $(INSTALL_DIR)/tmcc
+	$(INSTALL) -m 755 $(SRCDIR)/supfile $(INSTALL_DIR)/supfile
+	-mkdir -p /root/.cvsup
+	$(INSTALL) -m 600 $(SRCDIR)/cvsup.auth /root/.cvsup/auth

tmcd/linux/cvsup.auth

+paper.emulab.net:root@any.emulab.net:NoStinkingPassword:

tmcd/linux/group

@@ -27,3 +27,4 @@ popusers:x:45:
 slipusers:x:46:
 xfs:x:43:
 abone:x:500:
+testbed:x:6000:

tmcd/linux/gshadow

@@ -25,5 +25,6 @@ utmp:x::
 pppusers:x::
 popusers:x::
 slipusers:x::
-calfeld:!::
 xfs:!::
+testbed:x::
+

tmcd/linux/passwd

@@ -14,7 +14,6 @@ gopher:x:13:30:gopher:/usr/lib/gopher-data:
 ftp:x:14:50:FTP User:/home/ftp:
 nobody:x:99:99:Nobody:/:
 xfs:x:43:43:X Font Server:/etc/X11/fs:/bin/false
-stoller:x:282:601::/users/stoller:/bin/tcsh
 abocc:x:500:500:Abone administration:/local/abocc:/bin/bash
 anee1:x:501:500:Abone EE Account:/local/anee1:/bin/bash
 anee2:x:502:500:Abone EE Account:/local/anee2:/bin/bash
@@ -22,12 +21,12 @@ anee3:x:503:500:Abone EE Account:/local/anee3:/bin/bash
 anee4:x:504:500:Abone EE Account:/local/anee4:/bin/bash
 anee5:x:505:500:Abone EE Account:/local/anee5:/bin/bash
 anpub:x:506:500:Abone EE Account:/local/anpub:/bin/bash
-newbold:x:2224:601:Mac Newbold:/users/newbold:/bin/tcsh
-calfeld:x:2986:601:Chris Alfeld:/users/calfeld:/bin/tcsh
-axon:x:2347:601:Logan Axon:/users/axon:/bin/tcsh
-danderse:x:2146:601:David G Andersen:/users/danderse:/bin/tcsh
-mike:x:27:601:Mike Hibler:/users/mike:/bin/tcsh
-reid:x:1296:601:Alastair Reid:/users/reid:/bin/tcsh
-ricci:x:1182:601:Robert P Ricci:/users/ricci:/bin/tcsh
-lepreau:x:12:601:Jay Lepreau:/users/lepreau:/bin/tcsh
-kwright:x:1025:601:Kristin Wright:/users/kwright:/bin/tcsh
+stoller:x:282:6000::/users/stoller:/bin/tcsh
+newbold:x:2224:6000:Mac Newbold:/users/newbold:/bin/tcsh
+calfeld:x:2986:6000:Chris Alfeld:/users/calfeld:/bin/tcsh
+axon:x:2347:6000:Logan Axon:/users/axon:/bin/tcsh
+danderse:x:2146:6000:David G Andersen:/users/danderse:/bin/tcsh
+mike:x:27:6000:Mike Hibler:/users/mike:/bin/tcsh
+reid:x:1296:6000:Alastair Reid:/users/reid:/bin/tcsh
+ricci:x:1182:6000:Robert P Ricci:/users/ricci:/bin/tcsh
+lepreau:x:12:6000:Jay Lepreau:/users/lepreau:/bin/tcsh

tmcd/linux/rc.testbed

 #!/bin/sh
 
+echo "Checking for file updates ..."
+export HOME=/root
+/usr/local/bin/cvsup -1 -g -L 1 /etc/rc.d/testbed/supfile
+
 if [ -x /etc/rc.d/testbed/setup  ]; then
         echo "Setting up Testbed Configuration"
 	/etc/rc.d/testbed/setup

tmcd/linux/shadow

@@ -14,7 +14,6 @@ gopher:*:11152:0:99999:7:::
 ftp:*:11152:0:99999:7:::
 nobody:*:11152:0:99999:7:::
 xfs:!!:11169:0:99999:7:::
-stoller:$1$GflppnwT$C0ye6tL1kjCJw1n4MsVI1/:11311:0:99999:7:-1:-1:134540332
 abocc:!!:11311:0:99999:7:::
 anee1:!!:11311:0:99999:7:::
 anee2:!!:11311:0:99999:7:::
@@ -22,6 +21,7 @@ anee3:!!:11311:0:99999:7:::
 anee4:!!:11311:0:99999:7:::
 anee5:!!:11311:0:99999:7:::
 anpub:!!:11311:0:99999:7:::
+stoller:$1$GflppnwT$C0ye6tL1kjCJw1n4MsVI1/:11311:0:99999:7:-1:-1:134540332
 newbold:b5CNBeTTiXYqA:11311:0:99999:7:::
 calfeld:amGW2iuQCjmyQ:11311:0:99999:7:::
 axon:MAg80zUaZS52Q:11311:0:99999:7:::
@@ -30,4 +30,3 @@ mike:OQYay0WnwMYTs:11311:0:99999:7:::
 reid:i9vTbxvJp1Rpo:11311:0:99999:7:::
 ricci:3MYM/vEONbd8k:11311:0:99999:7:::
 lepreau:XzOQ6qRSyDp5A:11311:0:99999:7:::
-kwright:LOBUwwa97jn36:11311:0:99999:7:::

tmcd/linux/supfile

+RHL62-STD  host=boss.emulab.net base=/etc/rc.d/testbed/sup prefix=/ preserve delete release=current
+

tmcd/tmcc.c

@@ -10,12 +10,16 @@
 #include <sys/time.h>
 #include <time.h>
 #include <assert.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 #include "decls.h"
 
 #ifdef LBS
 #define	MASTERNODE	"206.163.153.25"
 #else
-#define	MASTERNODE	"155.99.212.70"
+#define	MASTERNODE	"boss.emulab.net"
 #endif
 
 void		sigcatcher(int foo);
@@ -26,6 +30,8 @@ main(int argc, char **argv)
 	struct sockaddr_in	name, client;
 	struct timeval		tv;
 	struct itimerval	timo;
+	struct hostent		*he;
+	struct in_addr		serverip;
 	char			buf[BUFSIZ], *bp, *response = "";
 
 	if (argc < 2 || argc > 3) {
@@ -33,6 +39,18 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
+#ifdef	LBS
+	inet_aton(MASTERNODE, &serverip);
+#else
+	he = gethostbyname(MASTERNODE);
+	if (he)
+		memcpy((char *)&serverip, he->h_addr, he->h_length);
+	else {
+		fprintf(stderr, "gethostbyname(%s) failed\n", MASTERNODE); 
+		exit(1);
+	}
+#endif
+
 	while (1) {
 		/* Create socket from which to read. */
 		sock = socket(AF_INET, SOCK_STREAM, 0);
@@ -43,7 +61,7 @@ main(int argc, char **argv)
 
 		/* Create name. */
 		name.sin_family = AF_INET;
-		inet_aton(MASTERNODE, &name.sin_addr);
+		name.sin_addr   = serverip;
 		name.sin_port = htons(TBSERVER_PORT);
 
 		if (connect(sock,