A couple of changes for the Wifi cdboot version

tmcd/freebsd5/GNUmakefile.in

@@ -70,6 +70,7 @@ cdboot-install:	destdircheck basefbsdcdboot-install etc-install \
 	rm -f $(SYSETCDIR)/rc.cdroot $(SYSETCDIR)/fstab.lbs
 	rm -f $(DESTDIR)/boot/loader.rc.lbs
 	$(INSTALL) -m 755 $(SRCDIR)/cdboot/rc.conf $(SYSETCDIR)/rc.conf
+	$(INSTALL) -m 755 $(SRCDIR)/cdboot/rc.dhclient $(SYSETCDIR)/rc.conf.d/dhclient
 #	$(INSTALL) -m 755 $(SRCDIR)/cdboot/rc.cdboot $(BINDIR)/rc/rc.cdboot
 	$(INSTALL) -m 755 $(SRCDIR)/cdboot/cdroot $(SYSETCDIR)/rc.d/cdroot
 	cp $(SRCDIR)/cdboot/fstab $(SYSETCDIR)/fstab

tmcd/freebsd5/cdboot/rc.conf

@@ -4,7 +4,7 @@ nfs_client_enable="YES"
 usbd_enable="NO"
 ntpd_enable="NO"
 ntpdate_enable="YES"
-ntpdate_flags="-b boss.emulab.net"
+ntpdate_flags="-b ntp1.emulab.net"
 syslogd_enable="YES"
 inetd_enable="NO"
 cron_enable="NO"
@@ -24,6 +24,20 @@ rc_info="YES"
 #
 network_interfaces="lo0"
 
+#
+# Argh! dhclient in FreeBSD 5 has a new auto-background "feature",
+# it dives into the background after 10 seconds regardless of whether
+# it has received a response.  This is fubar for us.  Unfortunately,
+# we cannot just crank this number through the roof because it is based
+# on a polling interval which actually has a rational purpose.  The timeout
+# is actually (2 * polling_interval) where polling_interval is how often
+# dhclient rechecks an interface without link.  We need to keep this value
+# reasonable in the event that we boot up and don't immediately have link
+# on the control net.  So lets try 15 seconds (30 second auto-background
+# timeout) and see how things go.
+#
+dhclient_flags="-i 15"
+
 # For CD
 root_rw_mount="NO"
 background_fsck="NO"

tmcd/freebsd5/cdboot/rc.dhclient

+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004, 2006 University of Utah and the Flux Group.
+# All rights reserved.
+#
+# In rc.conf, we have told it to just to configure lo0.  Then when the
+# rc.d/dhclient script is executed, it sources this (/etc/rc.conf.d/dhclient)
+# file where we identify all the actual interfaces and mark them as
+# DHCPable.
+#
+# We do this work here rather than directly in rc.conf because rc.conf
+# is sourced by every startup rc file and even some periodic scripts.
+# No point in doing all this work a million times for no reason.
+#
+network_interfaces=`ifconfig -l | sed -E -e 's/(lo|ath|plip)[0-9]//g'`
+for _if in $network_interfaces; do
+	eval ifconfig_${_if}="DHCP"
+done