Added a dhcpd.conf template, and pointed people to it in the boss setup

documentation.

db/dhcpd_makeconf.in

@@ -9,7 +9,6 @@ use Getopt::Std;
 #
 # subnet 155.101.132.0 netmask 255.255.252.0 {
 #	option  routers                 155.101.132.1;
-#	option  domain-name-servers     155.101.128.70;
 #	option subnet-mask		255.255.252.0;
 #
 #	option dhcp-class-identifier "PXEClient";
@@ -24,6 +23,10 @@ use Getopt::Std;
 #
 #	}
 # }
+#
+# There is an example template file in the CVS repository, in the dhcpd/
+# directory.
+#
 
 
 #

dhcpd/dhcpd.conf.template

+#
+# dhcpd.conf.template - From the emulab software distribution
+#
+# This file is used with dhcpd_makeconf to generate an actual dhpd.conf file
+# from the database.
+#
+# Make sure to change all subnets (don't forget the mask!), the DHCP and DNS
+# servers' IP addresses, the router's IP, and see the comment about nodetypes
+# below.
+#
+server-identifier               155.101.128.70;
+server-name                     "155.101.128.70";
+next-server			155.101.128.70;
+
+option  domain-name-servers     155.101.128.70;
+option  domain-name             "emulab.net";
+
+option  root-path		"/tftpboot";
+
+default-lease-time              36000;                  # 10 hours
+max-lease-time                  36000;                  # 10 hours
+
+subnet 155.101.132.0 netmask 255.255.252.0 {
+	option subnet-mask		255.255.252.0;
+
+	option  routers                 155.101.132.1;
+
+	option dhcp-class-identifier "PXEClient";
+
+	# testbed PCs
+	group {
+		option dhcp-class-identifier "PXEClient";
+
+		#
+		# For every PC nodetype, include a line like the the one below.
+		# These lines will be replaced with auto-generated entries for
+		# nodes of that type.	
+		#
+		%%nodetype=pc600
+
+	}
+}

doc/setup.txt

@@ -142,6 +142,9 @@ can be world-readable
 DHCP - Need to install the dhcpd config file. The old (deprecated) location was
 /usr/site/bin/dhcp/dhcpd.conf. The new location (and the place you should
 install it if you used the 'isc-dhcpd' port) is /usr/local/etc/dhcpd.conf .
+After you've filled the nodes and interfaces tables, (described in the database
+setup documentation) use the dhcpd_makeconf script, along with the template in
+the dhcpd directory of the CVS repository, to generate the dhcpd.conf file.
 
 RC scripts - The mysql-client rc script needs to run before ANY testbed
 services are started! The mysql server should also be started early in the