diff options
author | Liu Aleaxander <Aleaxander@gmail.com> | 2009-08-31 06:22:26 +0800 |
---|---|---|
committer | Liu Aleaxander <Aleaxander@gmail.com> | 2009-08-31 06:22:26 +0800 |
commit | 53793f217eef16ac53000730fa364efb3b3f4a7a (patch) | |
tree | 9232bf5a9c8e99b2752c0f77d0df47a5851a9f00 /core | |
parent | 8b584217d5b18b7737c344bfb45570af1379da24 (diff) | |
download | syslinux-53793f217eef16ac53000730fa364efb3b3f4a7a.tar.gz |
Core:pxelinux: fix the config file loading when we got a DHCP option
I knew what the DHCP option is now.
Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
Diffstat (limited to 'core')
-rw-r--r-- | core/fs/pxe/pxe.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c index bbc77e04..37ba0310 100644 --- a/core/fs/pxe/pxe.c +++ b/core/fs/pxe/pxe.c @@ -1055,9 +1055,8 @@ static int pxe_load_config(void) get_prefix(); if (DHCPMagic & 0x02) { /* We got a DHCP option, try it first */ - /* XXX: I have no idea where the config_file came from */ - //if (try_load(NULL)) - //return 0; + if (try_load(boot_file)) + return 0; } /* |