[Fai-commit] r3528 - in trunk/examples: etc simple/files/etc/dhcp3/dhcpd.conf

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-07-06 14:04:05 +0000 (Thu, 06 Jul 2006)
New Revision: 3528

Modified:
   trunk/examples/etc/dhcpd.conf
   trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER
Log:
next-server is needed in dhcpd >=3.0.3


Modified: trunk/examples/etc/dhcpd.conf
===================================================================
--- trunk/examples/etc/dhcpd.conf	2006-06-19 07:53:26 UTC (rev 3527)
+++ trunk/examples/etc/dhcpd.conf	2006-07-06 14:04:05 UTC (rev 3528)
@@ -6,20 +6,16 @@
 use-host-decl-names on;
 #always-reply-rfc1048 on;
 
-filename "pxelinux.0";
 
-# the server from which to load the initial boot file if different
-# from server-name (if the DHCP server is not also the TFTP server)
-#next-server faiserver;
-
-
 subnet 192.168.1.0 netmask 255.255.255.0 {
    option routers 192.168.1.250;
    option domain-name "beowulf";
    option domain-name-servers 192.168.1.250;
    option time-servers faiserver;
    option ntp-servers faiserver;
-   server-name "faiserver";
+   server-name faiserver;
+   next-server faiserver;
+   filename "pxelinux.0";
 }
 
 # perl -ane ' {print "host atom {hardware ethernet $1;fixed-address atom}";}'

Modified: trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER	2006-06-19 07:53:26 UTC (rev 3527)
+++ trunk/examples/simple/files/etc/dhcp3/dhcpd.conf/FAISERVER	2006-07-06 14:04:05 UTC (rev 3528)
@@ -6,19 +6,15 @@
 use-host-decl-names on;
 #always-reply-rfc1048 on;
 
-filename "pxelinux.0";
-
-# the server from which to load the initial boot file if different
-# from server-name (if the DHCP server is not also the TFTP server)
-#next-server faiserver;
-
 subnet 192.168.1.0 netmask 255.255.255.0 {
    option routers 192.168.1.250;
    option domain-name "fai";
    option domain-name-servers 192.168.1.250;
    option time-servers faiserver;
    option ntp-servers faiserver;
-   server-name "faiserver";
+   server-name faiserver;
+   next-server faiserver;
+   filename "pxelinux.0";
 }
 
 # generate more lines with: