Commits

Alexandre Macabies  committed a1c95b4 Merge

Merged prologin/sadm into master

  • Participants
  • Parent commits 29353e0, 9d5b669

Comments (0)

Files changed (1)

File dhcp/dhcpd.conf

     # DNS search domain
     option domain-name prolo;
 
-    # User subnet. No dynamic allocation there.
-    subnet 192.168.0.0 netmask 255.255.255.0 {
-        option routers 192.168.0.254;
-        option domain-name-servers 192.168.0.254;
-
-        next-server 192.168.0.254;
-        filename "prologin.kpxe";
-
-        deny unknown-clients;
-    }
-
-    # Services subnet. No dynamic allocation there, no PXE (machines have a
-    # local hard drive).
-    # The service subnet is split into 2 /25 in order to have 2 RFS/HFS on the
-    # same machine (Linux has trouble with 2 NICs on the same /24).
-    subnet 192.168.1.0 netmask 255.255.255.128 {
-        option routers 192.168.1.126;
-        option domain-name-servers 192.168.1.126;
-
-        deny unknown-clients;
-    }
-    subnet 192.168.1.128 netmask 255.255.255.128 {
+    # User and services subnet.
+    subnet 192.168.0.0 netmask 255.255.254.0 {
         option routers 192.168.1.254;
         option domain-name-servers 192.168.1.254;
 
+        next-server 192.168.1.254;
+        filename "prologin.kpxe";
+
         deny unknown-clients;
     }