[syslinux:elflink] pxe: Don't call open_config() from the pxe core

syslinux-bot for Matt Fleming matt.fleming at intel.com
Mon Nov 5 08:03:06 PST 2012


Commit-ID:  77c1b364a530e51287f274a90b0744436c3312e8
Gitweb:     http://www.syslinux.org/commit/77c1b364a530e51287f274a90b0744436c3312e8
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Wed, 31 Oct 2012 14:17:49 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Thu, 1 Nov 2012 12:33:09 +0000

pxe: Don't call open_config() from the pxe core

Delete some stale comments about ldlinux.c32 requiring ConfigName to
be initialised before it's launched - this is no longer
true. ldlinux.c32 takes care of opening the config files.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 core/pxelinux.asm |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index ef9c723..35c7408 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -192,8 +192,7 @@ ROOT_FS_OPS:
 		call reset_idle
 
 ;
-; Now we're all set to start with our *real* business.	First load the
-; configuration file (if any) and parse it.
+; Now we're all set to start with our *real* business.
 ;
 ; In previous versions I avoided using 32-bit registers because of a
 ; rumour some BIOSes clobbered the upper half of 32-bit registers at
@@ -217,16 +216,6 @@ ROOT_FS_OPS:
 %endmacro
 
 ;
-; Open configuration file. ldlinux.c32 needs ConfigName to be set - so we need
-; to call open_config() before loading it.
-;
-; Note: We don't need to check return value of open_config() function. It will
-; call kaboom() on failure.
-;
-		extern open_config
-		pm_call open_config
-
-;
 ; Jump to 32-bit ELF space
 ;
 		pm_call load_env32


More information about the Syslinux-commits mailing list