Ver código fonte

[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>
tags/v1.20.1
Michael Brown 12 anos atrás
pai
commit
9200049c80
1 arquivos alterados com 2 adições e 4 exclusões
  1. 2
    4
      src/arch/i386/prefix/pxeprefix.S

+ 2
- 4
src/arch/i386/prefix/pxeprefix.S Ver arquivo

@@ -396,10 +396,8 @@ get_cmdline:
396 396
 	movw	$0xffff, ( pxe_parameter_structure + 0x02 )
397 397
 	movw	$PXENV_FILE_CMDLINE, %bx
398 398
 	call	pxe_call
399
-	jnc	1f
400
-	call	print_pxe_error
401
-	jmp	99f
402
-1:	/* Check for non-NULL command line */
399
+	jc	99f  /* Suppress errors; this is an iPXE extension API call */
400
+	/* Check for non-NULL command line */
403 401
 	movw	( pxe_parameter_structure + 0x02 ), %ax
404 402
 	testw	%ax, %ax
405 403
 	jz	99f

Carregando…
Cancelar
Salvar