[syslinux:elflink] ldlinux: Fix "prompt" config option parsing
syslinux-bot for Matt Fleming
matt.fleming at linux.intel.com
Tue Jul 12 20:03:14 PDT 2011
Commit-ID: 272218d09ee73ea2c5d84c2cf8bb4c024a7a0219
Gitweb: http://syslinux.zytor.com/commit/272218d09ee73ea2c5d84c2cf8bb4c024a7a0219
Author: Matt Fleming <matt.fleming at linux.intel.com>
AuthorDate: Wed, 25 May 2011 15:35:53 +0100
Committer: Matt Fleming <matt.fleming at linux.intel.com>
CommitDate: Wed, 25 May 2011 15:35:53 +0100
ldlinux: Fix "prompt" config option parsing
Previously, we were looking for the value of the prompt option 8
characters after the first 'p', clearly since "prompt" is only 6
characters we should be searching after the sixth character.
I noticed this bug when specifying "prompt 1" in my config file and
Syslinux still tried to boot the default kernel.
Signed-off-by: Matt Fleming <matt.fleming at linux.intel.com>
---
com32/elflink/ldlinux/readconfig.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 8ded92a..1c8cac3 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -1105,7 +1105,7 @@ do_include:
else if (looking_at(p, "implicit")) {
allowimplicit = atoi(skipspace(p + 8));
} else if (looking_at(p, "prompt")) {
- forceprompt = atoi(skipspace(p + 8));
+ forceprompt = atoi(skipspace(p + 6));
} else if (looking_at(p, "console")) {
displaycon = atoi(skipspace(p + 7));
} else if (looking_at(p, "allowoptions")) {
More information about the Syslinux-commits
mailing list