aboutsummaryrefslogtreecommitdiffstats
path: root/core/isolinux.asm
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-07-25 17:27:37 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-07-25 17:28:10 -0700
commit6f2d1b84131b0a9039562dbd96dbd27e0079f287 (patch)
tree45bb405516eb2abfc37abeee6b54a1ec5ee664fa /core/isolinux.asm
parent4ad669661e034f6069c3ce0d6b97a8f297cf33b3 (diff)
downloadsyslinux-6f2d1b84131b0a9039562dbd96dbd27e0079f287.tar.gz
core: don't hang if no config file is found
If we can't find a configuration file, we need to do something slightly more friendly than hanging. Reported-by: Sebastian Herbszt <herbszt@gmx.de> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/isolinux.asm')
-rw-r--r--core/isolinux.asm3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm
index 1ef68d8c..ca8ee3a3 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -1186,7 +1186,8 @@ ROOT_FS_OPS:
;
; Locate the configuration file
;
- pm_call load_config
+ pm_call pm_load_config
+ jz no_config_file
;
; Now we have the config file open. Parse the config file and