|author||Matt Fleming <firstname.lastname@example.org>||2011-04-26 09:51:32 +0100|
|committer||Matt Fleming <email@example.com>||2011-04-26 09:51:32 +0100|
Merge branch 'for-hpa/elflink/core' into elflink
1 files changed, 3 insertions, 23 deletions
diff --git a/core/diskfs.inc b/core/diskfs.inc
index ded89b55..470aa429 100644
@@ -84,31 +84,11 @@ trackbuf resb trackbufsize ; Track buffer goes here
-; 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
- ;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