Add new PXE keyword (we might have to distinguish from BOOT at some point)

6 files changed, 17 insertions, 11 deletions

diff --git a/comboot.doc b/comboot.doc
index a90c25b5..92852012 100644
--- a/comboot.doc
+++ b/comboot.doc
@@ -668,12 +668,13 @@ AX=0016h [3.10] Run kernel image
 	EDX	Config	Extensions	Type of file	
 	0	KERNEL			Determined by filename extension
 	1	LINUX	none		Linux kernel image
-	2	BOOT	.0 .bs .bin	Bootstrap program
+	2	BOOT	.bs .bin	Bootstrap program
 	3	BSS	.bss		Boot sector with patch [SYSLINUX]
-	4	FDIMAGE	.img		Floppy disk image [ISOLINUX]
-	5	COMBOOT	.com .cbt	16-bit COMBOOT program
-	6	COM32	.c32		COM32 program
-	7	CONFIG			Configuration file
+	4	PXE	.0		PXE Network Bootstrap Prog [PXELINUX]
+	5	FDIMAGE	.img		Floppy disk image [ISOLINUX]
+	6	COMBOOT	.com .cbt	16-bit COMBOOT program
+	7	COM32	.c32		COM32 program
+	8	CONFIG			Configuration file
 
 
 AX=0017h [3.30] Report video mode change
diff --git a/kernel.inc b/kernel.inc
index 2a99da57..e4ff0219 100644
--- a/kernel.inc
+++ b/kernel.inc
@@ -94,10 +94,11 @@ VK_KERNEL	equ 0			; Choose by filename
 VK_LINUX	equ 1			; Linux kernel image
 VK_BOOT		equ 2			; Boot sector
 VK_BSS		equ 3			; BSS boot sector
-VK_FDIMAGE	equ 4			; Floppy disk image
-VK_COMBOOT	equ 5			; COMBOOT image
-VK_COM32	equ 6			; COM32 image
-VK_CONFIG	equ 7			; Configuration file
-VK_TYPES	equ 8			; Number of VK types
+VK_PXE		equ 4			; PXE NBP
+VK_FDIMAGE	equ 5			; Floppy disk image
+VK_COMBOOT	equ 6			; COMBOOT image
+VK_COM32	equ 7			; COM32 image
+VK_CONFIG	equ 8			; Configuration file
+VK_TYPES	equ 9			; Number of VK types
 
 %endif ; _KERNEL_INC
diff --git a/keywords b/keywords
index 95c9379c..72a880d7 100644
--- a/keywords
+++ b/keywords
@@ -12,6 +12,7 @@ kernel
 linux
 boot
 bss
+pxe
 fdimage
 comboot
 com32
diff --git a/keywords.inc b/keywords.inc
index 908fd4ea..02510a11 100644
--- a/keywords.inc
+++ b/keywords.inc
@@ -57,6 +57,7 @@ keywd_table:
 		keyword linux,     	pc_kernel,	VK_LINUX
 		keyword boot,      	pc_kernel,	VK_BOOT
 		keyword bss,       	pc_kernel,	VK_BSS
+		keyword pxe,       	pc_kernel,	VK_PXE
 		keyword fdimage,   	pc_kernel,	VK_FDIMAGE
 		keyword comboot,   	pc_kernel,	VK_COMBOOT
 		keyword com32,    	pc_kernel,	VK_COM32
diff --git a/syslinux.doc b/syslinux.doc
index a5500873..69a64d42 100644
--- a/syslinux.doc
+++ b/syslinux.doc
@@ -193,8 +193,9 @@ LABEL label
 	format (for SYSLINUX.)
 
   LINUX image			- Linux kernel image (default)
-  BOOT image			- Bootstrap program (.bs, .0, .bin)
+  BOOT image			- Bootstrap program (.bs, .bin)
   BSS image			- BSS image (.bss)
+  PXE image			- PXE Network Bootstrap Program (.0)
   FDIMAGE image			- Floppy disk image (.img)
   COMBOOT image			- COMBOOT program (.com, .cbt)
   COM32 image			- COM32 program (.c32)
diff --git a/ui.inc b/ui.inc
index b5eed64a..50916525 100644
--- a/ui.inc
+++ b/ui.inc
@@ -562,6 +562,7 @@ kerneltype_table:
 		dw is_linux_kernel	; VK_LINUX
 		dw is_bootsector	; VK_BOOT
 		dw is_bss_sector	; VK_BSS
+		dw is_bootsector	; VK_PXE
 		dw is_disk_image	; VK_FDIMAGE
 		dw is_comboot_image	; VK_COMBOOT
 		dw is_com32_image	; VK_COM32