aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-06-25 00:15:54 +0200
committerDaniel Baumann <daniel@debian.org>2010-06-25 00:15:54 +0200
commite2f3998297a32e761c83741ab55bc9612a8e9c99 (patch)
treea27ac7f6d05ebfa82dde064e524ae403bb69e03e /man
parent647a3f96a779d15773dd766c566dffa2c905d2e2 (diff)
downloadsyslinux-e2f3998297a32e761c83741ab55bc9612a8e9c99.tar.gz
syslinux-e2f3998297a32e761c83741ab55bc9612a8e9c99.tar.xz
syslinux-e2f3998297a32e761c83741ab55bc9612a8e9c99.zip
Updating description in syslinux manpage wrt/ default entries as of syslinux >= 3.85.
Diffstat (limited to 'man')
-rw-r--r--man/syslinux.112
1 files changed, 9 insertions, 3 deletions
diff --git a/man/syslinux.1 b/man/syslinux.1
index 70d44d1b..1729ddd4 100644
--- a/man/syslinux.1
+++ b/man/syslinux.1
@@ -76,10 +76,16 @@ with a hash mark (#) are ignored.
Sets the default command line. If \fBsyslinux\fP boots automatically, it will act
just as if the entries after "default" had been typed in at the "boot:" prompt.
.IP
-If no configuration file is present, or no "default" entry is present in the
-configuration file, the default is "linux auto".
+If no DEFAULT or UI statement is found, or the configuration file is missing
+entirely, \s-1SYSLINUX\s+1 drops to the boot: prompt with an error message (if
+NOESCAPE is set, it stops with a "boot failed" message; this is also the case
+for PXELINUX if the configuration file is not found.)
.TP
-NOTE: Earlier versions of \s-1SYSLINUX\s+1 used to automatically
+NOTE: Until \s-1SYSLINUX\s+1 3.85, if no configuration file is present, or no
+"default" entry is present in the configuration file, the default is
+"linux auto".
+.TP
+Even earlier versions of \s-1SYSLINUX\s+1 used to automatically
append the string "auto" to whatever the user specified using
the DEFAULT command. As of version 1.54, this is no longer
true, as it caused problems when using a shell as a substitute