aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-04 22:02:09 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-04 22:02:09 -0800
commite7b7832a4856ff509487650a61151e4fabad9f70 (patch)
tree2173b6ceacdc5752cf8c4880c85042427c0bffde /doc
parent88f16f147237ab25ffd83ba67a8ccfc963fa009d (diff)
parent3fc4c91dff9396a901d6c5056bf9828d0943aaf8 (diff)
downloadsyslinux-e7b7832a4856ff509487650a61151e4fabad9f70.tar.gz
syslinux-e7b7832a4856ff509487650a61151e4fabad9f70.tar.xz
syslinux-e7b7832a4856ff509487650a61151e4fabad9f70.zip
Merge branch 'master' into fsc
Resolved Conflicts: core/pxelinux.asm Note: this PXELINUX currently seems to hang with interrupts on trying to fetch the configuration file -- further debugging will be required. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/memdisk.txt15
-rw-r--r--doc/menu.txt8
2 files changed, 19 insertions, 4 deletions
diff --git a/doc/memdisk.txt b/doc/memdisk.txt
index 254cb7c9..c7244abc 100644
--- a/doc/memdisk.txt
+++ b/doc/memdisk.txt
@@ -132,15 +132,22 @@ g) The following option can be used to set the real-mode stack size.
stack=size Set the stack to "size" bytes
+h) Some systems without a floppy drive have been known to have
+ problems with floppy images. To avoid that those problems, first
+ of all make sure you don't have a floppy drive configured on the
+ BIOS screen. If there is no option to configure that, or that
+ doesn't work, you can use the option:
+
+ nopass Hide all real drives of the same type (floppy or hard disk)
+
Some interesting things to note:
If you're using MEMDISK to boot DOS from a CD-ROM (using ISOLINUX),
you might find the generic El Torito CD-ROM driver by Gary Tong and
-Bart Lagerweij useful:
-
- http://www.nu2.nu/eltorito/
-
+Bart Lagerweij useful. It is now included with the Syslinux
+distribution, in the dosutil directory. See the file
+dosutil/eltorito.txt for more information.
Similarly, if you're booting DOS over the network using PXELINUX, you
can use the "keeppxe" option and use the generic PXE (UNDI) NDIS
diff --git a/doc/menu.txt b/doc/menu.txt
index e1601249..c912c1df 100644
--- a/doc/menu.txt
+++ b/doc/menu.txt
@@ -48,6 +48,14 @@ MENU HIDDEN
All that is displayed is a timeout message.
+MENU CLEAR
+
+ Clear the screen when exiting the menu, instead of leaving the
+ menu displayed. For vesamenu, this means the graphical
+ background is still displayed without the menu itself for as
+ long as the screen remains in graphics mode.
+
+
MENU SHIFTKEY
Exit the menu system immediately unless either the Shift or Alt