aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-10-31 12:49:43 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-01 12:33:09 +0000
commita06aa6db6177f412718d1d121b5cf83616c281e9 (patch)
tree705de17ef6754078fede0fff49e4065f76a5e487
parent77c1b364a530e51287f274a90b0744436c3312e8 (diff)
downloadsyslinux-a06aa6db6177f412718d1d121b5cf83616c281e9.tar.gz
syslinux-a06aa6db6177f412718d1d121b5cf83616c281e9.tar.xz
syslinux-a06aa6db6177f412718d1d121b5cf83616c281e9.zip
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@intel.com>
-rw-r--r--com32/elflink/ldlinux/readconfig.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index 1db397a1..2fa0641e 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);