From b00ccfcd70999291ed74d346c744b30e0f2fa999 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Wed, 6 Apr 2011 13:31:16 +0100 Subject: [PATCH] elflink: Jump to kaboom if we fail to load ldlinux.c32 Previously if we failed to load ldlinux.c32, we would drop out of load_env32() and try to execute the assembly kernel loader. With this patch, if we drop out of load_env32() we jump to kaboom which drops the user at a command-line, at least that way they have a chance of fixing the reason ldlinux.c32 failed to load. Also, delete the comment that talks about loading and parsing the configuration file - that is now done by ldlinux.c32. Signed-off-by: Matt Fleming --- core/diskfs.inc | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/core/diskfs.inc b/core/diskfs.inc index 838f35d..00867ab 100644 --- a/core/diskfs.inc +++ b/core/diskfs.inc @@ -84,31 +84,11 @@ trackbuf resb trackbufsize ; Track buffer goes here stosw ; -; Now we're all set to start with our *real* business. First load the -; configuration file (if any) and parse it. -; -; In previous versions I avoided using 32-bit registers because of a -; rumour some BIOSes clobbered the upper half of 32-bit registers at -; random. I figure, though, that if there are any of those still left -; they probably won't be trying to install Linux on them... -; -; The code is still ripe with 16-bitisms, though. Not worth the hassle -; to take'm out. In fact, we may want to put them back if we're going -; to boot ELKS at some point. +; If we get to this point ldlinux.c32 failed to run. There's nothing +; left to do but inform that user that something went wrong. ; + jmp kaboom -; -; Load configuration file -; - ;feng - ;pm_call pm_load_config - ;jz no_config_file - -; -; Now we have the config file open. Parse the config file and -; run the user interface. -; - pm_call hello %include "ui.inc" ; -- 2.7.4