Take out shared-network example so people will stop copying it without

reading the comment.

diff --git a/server/dhcpd.conf b/server/dhcpd.conf
index a50dee0751defb6b6463725ff0d1980f37104f34..d58d54d6eafbf3990f77f9da6b8a95640dc45e09 100644 (file)
--- a/server/dhcpd.conf
+++ b/server/dhcpd.conf
@@ -1,67 +1,29 @@
 # dhcpd.conf
 #
-# Configuration file for ISC dhcpd
+# Sample configuration file for ISC dhcpd
 #
 
-# Hosts with more than one interface MUST specify a ``server-identifier'',
-# which should be the IP address of the server's primary network interface,
-# or if there is no interface that can be described that way, at least an
-# interface whose address isn't likely to change.
-
-server-identifier toccata.fugue.com;
-
 # option definitions common to all supported networks...
 option domain-name "fugue.com";
 option domain-name-servers toccata.fugue.com;
 
-# Shared network declaration is used to group subnets which share the same
-# physical network together.   The name is specified so that the shared
-# network can be referred to in log messages - it serves no other function.
-
-shared-network FUGUE {
-
-# option definitions common to this shared network.
-  option subnet-mask 255.255.255.224;
-  default-lease-time 600;
-  max-lease-time 7200;
+option subnet-mask 255.255.255.224;
+default-lease-time 600;
+max-lease-time 7200;
 
-# One of the two IP subnets that share this physical network
-#
-# Address ranges can be specified for each subnet attached to
-# a shared network.   Since these subnets share the same physical
-# network, addresses are pooled together, and assignments are made
-# without regard to the actual subnet.   If the optional dynamic-bootp
-# keyword is given in the address range declaration, then addresses
-# in that range can be assigned either with the DHCP protocol or the
-# BOOTP protocol; otherwise, only DHCP clients will have addresses
-# allocated from the address range.
-#
-# Note that each IP subnet can have its own options specific to that subnet.
-# options that aren't specified in the subnet are taken from the shared
-# network (if any) and then from the global option list.
-
-  subnet 204.254.239.0 netmask 255.255.255.224 {
-    range 204.254.239.10 204.254.239.20;
-    option broadcast-address 204.254.239.31;
-    option routers prelude.fugue.com;
-  }
+subnet 204.254.239.0 netmask 255.255.255.224 {
+  range 204.254.239.10 204.254.239.20;
+  option broadcast-address 204.254.239.31;
+  option routers prelude.fugue.com;
+}
 
 # The other subnet that shares this physical network
-  subnet 204.254.239.32 netmask 255.255.255.224 {
-    range dynamic-bootp 204.254.239.10 204.254.239.20;
-    option broadcast-address 204.254.239.31;
-    option routers snarg.fugue.com;
-  }
+subnet 204.254.239.32 netmask 255.255.255.224 {
+  range dynamic-bootp 204.254.239.10 204.254.239.20;
+  option broadcast-address 204.254.239.31;
+  option routers snarg.fugue.com;
 }
 
-# IP subnets that are alone on their physical wire should be declared by
-# themselves.   ISC dhcpd may still refer to them as shared networks in
-# log messages, but this is simply an artifact of the underlying data
-# structures.
-#
-# Note that options can be specified in the subnet declaration which
-# supersede the global options specified earlier.
-
 subnet 192.5.5.0 netmask 255.255.255.224 {
   range 192.5.5.26 192.5.5.30;
   option name-servers bb.home.vix.com, gw.home.vix.com;