[syslinux:master] doc/syslinux.txt: LOCALBOOT update to reflect current state

syslinux-bot for Gene Cumm gene.cumm at gmail.com
Wed Mar 16 13:39:07 PDT 2011


Commit-ID:  844e23ab45df8396cabdeff43763fa95206bb672
Gitweb:     http://syslinux.zytor.com/commit/844e23ab45df8396cabdeff43763fa95206bb672
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Mon, 28 Feb 2011 12:56:14 -0500
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Mon, 28 Feb 2011 12:56:14 -0500

doc/syslinux.txt: LOCALBOOT update to reflect current state

All variants now accept LOCALBOOT -1 as a fail over; Combine and reflow
the PXELINUX paragraph.


---
 doc/syslinux.txt |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/doc/syslinux.txt b/doc/syslinux.txt
index f5e1898..b6d3ec2 100644
--- a/doc/syslinux.txt
+++ b/doc/syslinux.txt
@@ -241,15 +241,17 @@ LABEL label
         Append nothing.  APPEND with a single hyphen as argument in a
         LABEL section can be used to override a global APPEND.
 
-    LOCALBOOT type			[ISOLINUX, PXELINUX]
-	On PXELINUX, specifying "LOCALBOOT 0" instead of a "KERNEL"
-	option means invoking this particular label will cause a local
-	disk boot instead of booting a kernel.
-
-	The argument 0 means perform a normal boot.  The argument 4
+    LOCALBOOT type
+	Attempt a different local boot method.  The special value -1
+	causes the boot loader to report failure to the BIOS, which, on
+	recent BIOSes, should mean that the next boot device in the
+	boot sequence should be activated.  Values other than those
+	documented may produce undesired results.
+
+	On PXELINUX, "type" 0 means perform a normal boot.  "type" 4
 	will perform a local boot with the Universal Network Driver
 	Interface (UNDI) driver still resident in memory.  Finally,
-	the argument 5 will perform a local boot with the entire PXE
+	"type" 5 will perform a local boot with the entire PXE
 	stack, including the UNDI driver, still resident in memory.
 	All other values are undefined.  If you don't know what the
 	UNDI or PXE stacks are, don't worry -- you don't want them,
@@ -257,10 +259,7 @@ LABEL label
 
 	On ISOLINUX, the "type" specifies the local drive number to
 	boot from; 0x00 is the primary floppy drive and 0x80 is the
-	primary hard drive.  The special value -1 causes ISOLINUX to
-	report failure to the BIOS, which, on recent BIOSes, should
-	mean that the next boot device in the boot sequence should be
-	activated.
+	primary hard drive.
 
     INITRD initrd_file
 	Starting with version 3.71, an initrd can be specified in a



More information about the Syslinux-commits mailing list