[syslinux] [GIT PULL] elflink core

Matt Fleming matt at console-pimps.org
Sat Apr 16 07:15:38 PDT 2011


The following changes since commit 844e965443e08133a7a366a496d8cc52ef93ca48:

  Merge commit 'syslinux-4.04-pre18' into elflink (2011-04-04 14:12:08 -0700)

are available in the git repository at:

  git://git.zytor.com/users/mfleming/syslinux.git for-hpa/elflink/core

Matt Fleming (1):
      elflink: Jump to kaboom if we fail to load ldlinux.c32

 core/diskfs.inc |   26 +++-----------------------
 1 files 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"
 
 ;




More information about the Syslinux mailing list