[syslinux:elflink] ldlinux: Perform auto-boot if NOESCAPE set in config file
syslinux-bot for Matt Fleming
matt.fleming at linux.intel.com
Mon Apr 4 14:15:11 PDT 2011
Commit-ID: 8e74c9df19d5c9cb349aa0d62af61de2d0975888
Gitweb: http://syslinux.zytor.com/commit/8e74c9df19d5c9cb349aa0d62af61de2d0975888
Author: Matt Fleming <matt.fleming at linux.intel.com>
AuthorDate: Mon, 28 Mar 2011 17:47:37 +0100
Committer: Matt Fleming <matt.fleming at linux.intel.com>
CommitDate: Fri, 1 Apr 2011 10:44:18 +0100
ldlinux: Perform auto-boot if NOESCAPE set in config file
The previous logic for detecting when to perform an auto-boot was
incorrect, we should try to auto-boot if NOESCAPE is set in the config
file.
Signed-off-by: Matt Fleming <matt.fleming at linux.intel.com>
---
com32/elflink/ldlinux/ldlinux.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c
index 85066b1..a23b2f3 100644
--- a/com32/elflink/ldlinux/ldlinux.c
+++ b/com32/elflink/ldlinux/ldlinux.c
@@ -65,7 +65,7 @@ static int ldlinux_main(int argc, char **argv)
/*
* Auto boot
*/
- if (defaultlevel || !noescape) {
+ if (defaultlevel || noescape) {
if (defaultlevel) {
load_kernel(); /* Shouldn't return */
} else {
More information about the Syslinux-commits
mailing list