diff options
| author | Michael Brown <mcb30@ipxe.org> | 2012-07-18 18:18:28 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2012-07-18 18:19:25 +0100 |
| commit | 9200049c80f69280aaacc0bd917fd18d6d23ecce (patch) | |
| tree | 6c8c95b060658bc9b6af1e9cdc7088b288072e2c /src/arch | |
| parent | 2d7c966e77f504dc9b53f6d18a2f01deb7b9cb4a (diff) | |
| download | ipxe-9200049c80f69280aaacc0bd917fd18d6d23ecce.zip ipxe-9200049c80f69280aaacc0bd917fd18d6d23ecce.tar.gz ipxe-9200049c80f69280aaacc0bd917fd18d6d23ecce.tar.bz2 | |
[pxeprefix] Ignore errors from PXENV_FILE_CMDLINE
PXENV_FILE_CMDLINE is an iPXE extension, and will not be supported by
most PXE stacks. Do not report any errors to the user, since in
almost all cases the error will mean simply "not loaded by iPXE".
Reported-by: Patrick Domack <patrickdk@patrickdk.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/prefix/pxeprefix.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/arch/i386/prefix/pxeprefix.S b/src/arch/i386/prefix/pxeprefix.S index 3c851dc..05db989 100644 --- a/src/arch/i386/prefix/pxeprefix.S +++ b/src/arch/i386/prefix/pxeprefix.S @@ -396,10 +396,8 @@ get_cmdline: movw $0xffff, ( pxe_parameter_structure + 0x02 ) movw $PXENV_FILE_CMDLINE, %bx call pxe_call - jnc 1f - call print_pxe_error - jmp 99f -1: /* Check for non-NULL command line */ + jc 99f /* Suppress errors; this is an iPXE extension API call */ + /* Check for non-NULL command line */ movw ( pxe_parameter_structure + 0x02 ), %ax testw %ax, %ax jz 99f |