Initial PXELINUX/SYSLINUX bug fix/new protocol merge checkin.syslinux-1.49-0x3968dd43

1 files changed, 2 insertions, 66 deletions

diff --git a/pxelinux.doc b/pxelinux.doc
index 40081491..89f54b12 100644
--- a/pxelinux.doc
+++ b/pxelinux.doc
@@ -122,77 +122,13 @@ Using ISC dhcp 2.0 dhcpd.conf syntax:
         option domain-name-servers <dns servers>;
         option routers <default router>;
 
+	# Skip everything below if you want to use dynamic IP
+	# address assignment
         host <hostname> {
                 hardware ethernet <ethernet address>;
                 fixed-address <hostname>;
         }
 
-Using ISC dhcp 3.0 beta dhcpd.conf syntax:
-
-	# Declare the syntax of PXE options
-	# This is only needed at one point in the file
-	option space pxe;
-	option pxe.mtftp-ip		code  1 = ip-address;
-	option pxe.mtftp-cport		code  2 = unsigned integer 16;
-	option pxe.mtftp-sport		code  3 = unsigned integer 16;
-	option pxe.mtftp-tmout		code  4 = unsigned integer 8;
-	option pxe.mtftp-delay		code  5 = unsigned integer 8;
-	option pxe.discovery-control	code  6 = unsigned integer 8;
-	option pxe.discovery-mcast-addr	code  7 = ip-address;
-	option pxe.boot-servers		code  8 = array of {
-		unsigned integer 16,
-		unsigned integer 8,
-		array of ip-address
-	};
-	option pxe.boot-menu		code  9 = array of {
-		unsigned integer 16,
-		unsigned integer 8,
-		text
-	};
-	option pxe.menu-prompt		code 10 = {
-		unsigned integer 8,
-		text
-	};
-	option pxe.mcast-addrs-alloc	code 11 = {
-		ip-address,
-		unsigned integer 16,
-		unsigned integer 16
-	};
-	option pxe.credential-types	code 12 = array of unsigned integer 32;
-	option pxe.boot-item		code 71 = {
-		unsigned integer 16,
-		unsigned integer 16
-	};
-
-        allow booting;
-        allow bootp;
-
-        filename "/tftpboot/pxelinux.bin" ;
-        option dhcp-class-identifier "PXEClient";
-	vendor-option-space pxe;
-	option pxe.boot-menu		32768 12 "Network boot"
-	option pxe.menu-prompt		0 "Prompt"
-	option pxe.discovery-control	2
-	option pxe.boot-servers		32768 0
-	option pxe.boot-item		32768 0
-
-	next-server <TFTP-server>;
-	# server-identifier <TFTP-server>;	# Illegal! See below
-
-        option domain-name "<domain name>";
-        option subnet-mask <subnet mask>;
-        option broadcast-address <broadcast address>;
-        option domain-name-servers <dns servers>;
-        option routers <default router>;
-
-	option pxe.
-
-        host <hostname> {
-                hardware ethernet <ethernet address>;
-                fixed-address <hostname>;
-        }
-
-
 
 Note that if your particular TFTP daemon runs under chroot (tftp-hpa
 will do this if you specify the -s (secure) option; this is