diff options
| author | Michal Soltys <soltys@ziu.info> | 2010-10-14 23:08:55 +0200 |
|---|---|---|
| committer | Michal Soltys <soltys@ziu.info> | 2010-10-14 23:08:55 +0200 |
| commit | 6552cd5161c9d2623bb099f190aa54f1205d3de5 (patch) | |
| tree | eb7a961b1b2610b8861a6527f8d2a5bc4ea1c2cd /doc | |
| parent | c6ef920182ecba8bd67ea88223be48685b2ca30d (diff) | |
| parent | c61cb87b8595df9be415590b34968d974e5027bd (diff) | |
| download | syslinux-6552cd5161c9d2623bb099f190aa54f1205d3de5.tar.gz | |
Merge branch 'master' into chaindev
Conflicts:
com32/modules/chain.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/extlinux.txt | 2 | ||||
| -rw-r--r-- | doc/syslinux.txt | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/doc/extlinux.txt b/doc/extlinux.txt index 6974a517..9b267018 100644 --- a/doc/extlinux.txt +++ b/doc/extlinux.txt @@ -24,6 +24,8 @@ slight modifications. 2. The configuration file is called "extlinux.conf", and is expected to be found in the same directory as extlinux is installed in. + Since 4.00 "syslinux.cfg" is also tried if "extlinux.conf" is not + found. 3. Pathnames can be absolute or relative; if absolute (with a leading diff --git a/doc/syslinux.txt b/doc/syslinux.txt index 51d1332c..5b27a6eb 100644 --- a/doc/syslinux.txt +++ b/doc/syslinux.txt @@ -106,24 +106,25 @@ which requires root privilege. ++++ CONFIGURATION FILE ++++ +All options here apply to PXELINUX, ISOLINUX and EXTLINUX as well as +SYSLINUX unless otherwise noted. See the respective .txt files. + All the configurable defaults in SYSLINUX can be changed by putting a file called "syslinux.cfg" in the root directory of the boot disk. -This is a text file in either UNIX or DOS format, containing one or -more of the following items (case is insensitive for keywords; upper -case is used here to indicate that a word should be typed verbatim): - Starting with version 3.35, the configuration file can also be in either the /boot/syslinux or /syslinux directories (searched in that order.) If that is the case, then all filenames are assumed to be relative to that same directory, unless preceded with a slash or backslash. -All options here applies to PXELINUX, ISOLINUX and EXTLINUX as well as -SYSLINUX unless otherwise noted. See the respective .txt files. +The configuration file is a text file in either UNIX or DOS format, +containing one or more of the following items, each on its own line with +optional leading whitespace. Case is insensitive for keywords; upper +case is used here to indicate that a word should be typed verbatim. -# comment - A comment line. The whitespace after the hash mark is mandatory. +#comment + A comment line. INCLUDE filename Inserts the contents of another file at this point in the |