Take out shared-network statement to avoid confusion.

diff --git a/server/dhcpd.conf b/server/dhcpd.conf
index a50dee0751defb6b6463725ff0d1980f37104f34..596f750ccf07770e1bbdf4386a20497add8564b9 100644 (file)
--- a/server/dhcpd.conf
+++ b/server/dhcpd.conf
@@ -14,19 +14,10 @@ server-identifier toccata.fugue.com;
 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.
+option subnet-mask 255.255.255.224;
+default-lease-time 600;
+max-lease-time 7200;
 
-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;
-
-# 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
@@ -40,27 +31,17 @@ shared-network FUGUE {
 # 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;
-  }
-
-# 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.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;
 }
 
-# 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 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 192.5.5.0 netmask 255.255.255.224 {
   range 192.5.5.26 192.5.5.30;