Changes to support freebsd 5 series

tmcd/freebsd/chipset.awk

@@ -31,6 +31,15 @@ BEGIN {
     exit
 }
 
+#
+# pc850 under FreeBSD 5.x
+#
+/^acpi0: <INTEL  TR440BXA> on motherboard/ {
+    print "BX";
+    found = 1;
+    exit
+}
+
 #
 # aero:    pcib1: <PCI to PCI bridge (vendor=8086 device=2545)> ... Intel HI_C
 # rutgers: pcib1: <PCI to PCI bridge (vendor=8086 device=2543)> ... Intel HI_B

tmcd/freebsd/prepare

@@ -100,7 +100,7 @@ while ($dirent = readdir(LOG)) {
     my $file = $LOGDIR . "/" . $dirent;
     if (-f $file) {
         if (($file =~ /\.\d+$/) || ($file =~ /\.\d\.gz$/) ||
-	    ($file =~ /\.(today|yesterday)$/)) {
+	    ($file =~ /\.\d\.bz2$/) || ($file =~ /\.(today|yesterday)$/)) {
             # Remove archived logfiles
             unlink($file) or
                 die("Could not unlink $file: $!");

tmcd/freebsd/rc.kname

@@ -27,6 +27,18 @@ else {
 }
 
 if (-e $kernel) {
+    #
+    # In FreeBSD 5, the kernel is in /boot/<kernelname> along with its
+    # constituent modules.  We need to figure our what the correct thing
+    # to do is.
+    #
+    if ($kernel =~ m#^/boot/#) {
+	if ($kernel !~ m#^/boot/kernel/kernel$#) {
+	    print "WARNING: FreeBSD 5 running alternate kernel\n";
+	}
+	exit(0);
+    }
+
     if (system("cmp -s /kernel $kernel") != 0) {
 	if (system("cp -f /kernel /kernel.save")) {
 	    print "Could not backup /kernel! Aborting kernel change\n";

tmcd/freebsd5/GNUmakefile.in

+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2000-2004 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
+#
+# XXX ONLY RUN THIS INSTALL ON A FREEBSD TESTBED NODE!
+#
+# Trivial. These things just need to be installed into the right place
+# on a testbed node before cutting an image.
+#
+#
+SRCDIR		= @srcdir@
+TESTBED_SRCDIR	= @top_srcdir@
+OBJDIR		= ../..
+SUBDIR		= tmcd/freebsd5
+
+include $(OBJDIR)/Makeconf
+
+all:	supfile
+
+include $(TESTBED_SRCDIR)/GNUmakerules
+
+DESTDIR		=
+SYSETCDIR	= $(DESTDIR)/etc
+JAILDIR		= $(SYSETCDIR)/jail
+ETCDIR		= $(DESTDIR)$(CLIENT_ETCDIR)
+BINDIR		= $(DESTDIR)$(CLIENT_BINDIR)
+VARDIR		= $(DESTDIR)$(CLIENT_VARDIR)
+RCDIR		= $(DESTDIR)/usr/local/etc/rc.d
+ISMFS		= $(ETCDIR)/ismfs
+INSTALL		= /usr/bin/install -c
+
+install:	basefbsd-install etc-install \
+			sup-install script-install bin-install # jail-install
+
+simple-install:	script-install bin-install # jail-install
+
+dir-install:
+	$(INSTALL) -m 755 -o root -g wheel -d $(ETCDIR)
+	$(INSTALL) -m 755 -o root -g wheel -d $(BINDIR)
+	$(INSTALL) -m 755 -o root -g wheel -d $(RCDIR)
+	$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)
+	$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/db
+	$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/jails
+	$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/logs
+	$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/sup
+	$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/boot
+	$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/lock
+	-rm -rf $(DESTDIR)/etc/testbed
+	ln -s emulab $(DESTDIR)/etc/testbed
+	-rm -rf $(DESTDIR)/usr/local/etc/testbed
+	ln -s emulab $(DESTDIR)/usr/local/etc/testbed
+
+basefbsd-install: dir-install
+	(cd ../freebsd; $(MAKE) all install)
+	rm -f $(SYSETCDIR)/start_if.*
+
+sup-install:	dir-install
+	$(INSTALL) -m 755 ./supfile $(ETCDIR)/supfile
+
+bin-install:	dir-install
+
+etc-install:	dir-install sysetc-install
+	$(INSTALL) -m 644 $(SRCDIR)/group $(ETCDIR)/group
+	$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(ETCDIR)/master.passwd
+
+sysetc-install:	dir-install
+	$(INSTALL) -m 755 $(SRCDIR)/rc.conf $(SYSETCDIR)/rc.conf
+
+script-install:	dir-install
+#	$(INSTALL) -m 755 $(SRCDIR)/prepare $(BINDIR)/prepare
+	$(INSTALL) -m 755 $(SRCDIR)/dhclient $(BINDIR)/dhclient
+
+jail-install:	dir-install
+	$(INSTALL) -m 755 -o root -g wheel -d $(JAILDIR)
+	$(INSTALL) -m 644 $(SRCDIR)/jail/group $(JAILDIR)/group
+	$(INSTALL) -m 640 $(SRCDIR)/jail/master.passwd $(JAILDIR)/master.passwd
+	$(INSTALL) -m 755 $(SRCDIR)/jail/rc.conf $(JAILDIR)/rc.conf
+	$(INSTALL) -m 755 $(SRCDIR)/jail/rc.local $(JAILDIR)/rc.local
+	$(INSTALL) -m 755 $(SRCDIR)/jail/rc.injail $(BINDIR)/rc.injail
+	$(INSTALL) -m 755 $(SRCDIR)/jail/crontab $(JAILDIR)/crontab
+	$(INSTALL) -m 755 $(SRCDIR)/jail/jailsetup $(BINDIR)/jailsetup
+	$(INSTALL) -m 755 $(SRCDIR)/jail/mkjail.pl $(BINDIR)/mkjail.pl
+	$(INSTALL) -m 755 ./injail $(JAILDIR)/injail
+
+clean:
+	/bin/rm -f supfile

tmcd/freebsd5/dhclient

+#!/bin/sh
+
+. /etc/emulab/paths.sh
+
+trap 'exit 0' 15
+
+echo $* >> /tmp/dh
+
+cnet=`$BINDIR/control_interface`
+if [ -z "$cnet" ]; then
+	echo "WARNING: unknown control net interface, DHCP on all..."
+	/sbin/dhclient
+else
+	/sbin/dhclient $cnet
+fi
+exit 0

tmcd/freebsd5/group

+# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $
+#
+wheel:*:0:root,toor
+daemon:*:1:
+kmem:*:2:root,toor
+sys:*:3:root,toor
+tty:*:4:root,toor
+operator:*:5:root,toor
+mail:*:6:
+bin:*:7:
+news:*:8:
+man:*:9:
+games:*:13:
+staff:*:20:root,toor
+sshd:*:22:
+smmsp:*:25:
+mailnull:*:26:
+guest:*:31:root,toor
+bind:*:53:
+uucp:*:66:
+dialer:*:68:
+network:*:69:
+sfs:*:77:
+www:*:80:
+nogroup:*:65533:
+nobody:*:65534:

tmcd/freebsd5/loader.conf

+console="comconsole"
+
+beastie_disable="YES"

tmcd/freebsd5/make.conf

+KERNCONF?=       TESTBED
+BOOT_COMCONSOLE_SPEED=115200
+
+WRKDIRPREFIX=/usr/obj/ports
+DISTDIR=${WRKDIRPREFIX}/distfiles
+
+PERL_VER=5.6.1
+PERL_VERSION=5.6.1
+PERL_ARCH=mach
+NOPERL=yo
+NO_PERL=yo
+NO_PERL_WRAPPER=yo
+
+NO_KERBEROS=	YES
+
+#SUP_UPDATE=     YES
+#SUP=            /usr/local/bin/cvsup
+#SUPFLAGS=       -g -L 2 -z
+#SUPFILE1=       /etc/standard-supfile
+#PORTSSUPFILE=   /etc/ports-supfile

tmcd/freebsd5/master.passwd

+# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $
+#
+root:kEi.I6fTKyJDg:0:0::0:0:Charlie &:/root:/bin/csh
+toor:kEi.I6fTKyJDg:0:0::0:0:Chaplin &:/root:/bin/csh
+daemon:*:1:1::0:0:Owner of many system processes:/root:/sbin/nologin
+operator:*:2:5::0:0:System &:/:/sbin/nologin
+bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin
+tty:*:4:65533::0:0:Tty Sandbox:/:/sbin/nologin
+kmem:*:5:65533::0:0:KMem Sandbox:/:/sbin/nologin
+games:*:7:13::0:0:Games pseudo-user:/usr/games:/sbin/nologin
+news:*:8:8::0:0:News Subsystem:/:/sbin/nologin
+man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/sbin/nologin
+sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/sbin/nologin
+smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/sbin/nologin
+mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin
+bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin
+uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico
+pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin
+sfs:*:77:77::0:0:SFS pseudo-user:/:/bin/nologin
+www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin
+nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/sbin/nologin

tmcd/freebsd5/rc.conf

+
+# -- sysinstall generated deltas -- #
+# Created: Wed Jun 13 16:59:03 2001
+# Enable network daemons for user convenience.
+# This file now contains just the overrides from /etc/defaults/rc.conf
+# please make all changes to this file.
+
+sendmail_enable="NO"
+sshd_enable="YES"
+nfs_client_enable="YES"
+nfs_client_flags="-n 8"
+
+# For SFS/Jails
+rpcbind_enable="YES"
+mountd_enable="YES"
+nfs_server_enable="YES"
+nfs_server_flags="-u -t -n 8"
+nfs_bufpackets="24"
+
+# Emulab ntp configuration
+# ntpstart will take care of running ntpdate, so leave it disabled
+ntpd_enable="YES"
+ntpd_program="/usr/local/etc/emulab/ntpstart"
+ntpd_flags="/usr/sbin/ntpd -p /var/run/ntpd.pid"
+
+rc_info="YES"
+
+# Bah! Need to list all possible DHCP'able interfaces to keep
+# new scripts from trying to statically configure them
+ifconfig_em0="DHCP"
+ifconfig_fxp0="DHCP"
+ifconfig_fxp1="DHCP"
+ifconfig_fxp4="DHCP"
+ifconfig_xl0="DHCP"
+dhclient_program="/usr/local/etc/emulab/dhclient"

tmcd/freebsd5/supfile.in

+#
+# Bump as needed.
+#
+FBSD52-STD base=@CLIENT_VARDIR@ prefix=/ preserve release=20040301