[syslinux:elflink] ldlinux: Print a warning if no config file is found
syslinux-bot for Matt Fleming
matt.fleming at intel.com
Mon Nov 5 08:03:06 PST 2012
Commit-ID: a06aa6db6177f412718d1d121b5cf83616c281e9
Gitweb: http://www.syslinux.org/commit/a06aa6db6177f412718d1d121b5cf83616c281e9
Author: Matt Fleming <matt.fleming at intel.com>
AuthorDate: Wed, 31 Oct 2012 12:49:43 +0000
Committer: Matt Fleming <matt.fleming at intel.com>
CommitDate: Thu, 1 Nov 2012 12:33:09 +0000
ldlinux: Print a warning if no config file is found
This behaviour is taken from 4.06, where an error message is printed
if no config file is found. A warning is a more user-friendly choice
since Syslinux will still function without a config file.
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
---
com32/elflink/ldlinux/readconfig.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 1db397a..2fa0641 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -1420,7 +1420,10 @@ void parse_configs(char **argv)
current_menu = root_menu;
if (!argv || !*argv) {
- parse_one_config(NULL);
+ if (parse_one_config(NULL) < 0) {
+ printf("WARNING: No configuration file found\n");
+ return;
+ }
} else {
while ((filename = *argv++)) {
dprintf("Parsing config: %s", filename);
More information about the Syslinux-commits
mailing list