diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 20:08:32 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 20:25:02 -0700 |
| commit | 3953ca3532ca3281cc248f9985d9276c6f8486f0 (patch) | |
| tree | a03065fdb9d42e0d60867136b7abe25bbea99732 /doc | |
| parent | 57b7af7df6599a8cdb318d7adeda1cd6fb981626 (diff) | |
| download | syslinux-3953ca3532ca3281cc248f9985d9276c6f8486f0.tar.gz | |
Generalize ipappend handling as "sysappend", and move to PM code
Generalize the ipappend handling to cover all the derivatives, and
rename it "sysappend" ("ipappend" is a valid alias for all
derivatives.) Move all the string handling to protected mode.
Currently only pxelinux exports strings, but the plan is to change
that in the future.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/comboot.txt | 2 | ||||
| -rw-r--r-- | doc/syslinux.txt | 18 |
2 files changed, 14 insertions, 6 deletions
diff --git a/doc/comboot.txt b/doc/comboot.txt index 04d5deb8..cc78fbb1 100644 --- a/doc/comboot.txt +++ b/doc/comboot.txt @@ -735,7 +735,7 @@ AX=0016h [3.10] Run kernel image Input: AX 0016h DS:SI Filename of kernel image (zero-terminated string) ES:BX Command line (zero-terminated string) - ECX IPAPPEND flags [PXELINUX] + ECX Sysappend flags EDX Type of file (since 3.50) Output: Does not return if successful; returns with CF=1 if the kernel image is not found. diff --git a/doc/syslinux.txt b/doc/syslinux.txt index 07d5df9a..32f8dc4e 100644 --- a/doc/syslinux.txt +++ b/doc/syslinux.txt @@ -153,9 +153,12 @@ APPEND options... usually permitting explicitly entered kernel options to override them. This is the equivalent of the LILO "append" option. -IPAPPEND flag_val [PXELINUX only] - The IPAPPEND option is available only on PXELINUX. The - flag_val is an OR of the following options: +SYSAPPEND flag_val +IPAPPEND flag_val + + The SYSAPPEND option was introduced in Syslinux 4.10; it is an + enhancement of a previous option IPAPPEND which was only + available on PXELINUX. 1: indicates that an option of the following format should be generated and added to the kernel command line: @@ -169,6 +172,8 @@ IPAPPEND flag_val [PXELINUX only] the lease acquired by the PXE BIOS will expire, making the IP address available for reuse by the DHCP server. + This option is empty for non-PXELINUX. + 2: indicates that an option of the following format should be generated and added to the kernel command line: @@ -180,6 +185,8 @@ IPAPPEND flag_val [PXELINUX only] This allows an initrd program to determine from which interface the system booted. + This option is empty for non-PXELINUX. + 4: indicates that an option of the following format should be generated and added to the kernel command line: @@ -191,10 +198,11 @@ IPAPPEND flag_val [PXELINUX only] LABEL label KERNEL image APPEND options... - IPAPPEND flag_val [PXELINUX only] + SYSAPPEND flag_val [4.10+] + IPAPPEND flag_val [4.10+ or PXELINUX only] Indicates that if "label" is entered as the kernel to boot, Syslinux should instead boot "image", and the specified APPEND - and IPAPPEND options should be used instead of the ones + and SYSAPPEND options should be used instead of the ones specified in the global section of the file (before the first LABEL command.) The default for "image" is the same as "label", and if no APPEND is given the default is to use the |