mirror of
https://github.com/ipxe/ipxe.git
synced 2025-02-25 18:55:24 -06:00
[efi] Do not attempt to download autoexec.ipxe without a valid base URI
If we do not have a current working URI (after applying the EFI device path settings and any cached DHCP settings), then an attempt to download autoexec.ipxe will fail since there is no base URI from which to resolve the full autoexec.ipxe URI. Avoid this potentially confusing error message by attempting the download only if we have successfully obtained a current working URI. Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
@@ -28,6 +28,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
|
||||
#include <ipxe/timer.h>
|
||||
#include <ipxe/image.h>
|
||||
#include <ipxe/netdevice.h>
|
||||
#include <ipxe/uri.h>
|
||||
#include <ipxe/efi/efi.h>
|
||||
#include <ipxe/efi/efi_utils.h>
|
||||
#include <ipxe/efi/efi_autoexec.h>
|
||||
@@ -111,6 +112,14 @@ static int efi_autoexec_network ( EFI_HANDLE handle, struct image **image ) {
|
||||
goto err_create;
|
||||
}
|
||||
|
||||
/* Do nothing unless we have a usable current working URI */
|
||||
if ( ! cwuri ) {
|
||||
DBGC ( device, "EFI %s has no current working URI\n",
|
||||
efi_handle_name ( device ) );
|
||||
rc = -ENOTTY;
|
||||
goto err_cwuri;
|
||||
}
|
||||
|
||||
/* Open network device */
|
||||
if ( ( rc = netdev_open ( netdev ) ) != 0 ) {
|
||||
DBGC ( device, "EFI %s could not open net device: %s\n",
|
||||
@@ -130,6 +139,7 @@ static int efi_autoexec_network ( EFI_HANDLE handle, struct image **image ) {
|
||||
sync ( EFI_AUTOEXEC_TIMEOUT );
|
||||
|
||||
err_open:
|
||||
err_cwuri:
|
||||
mnptemp_destroy ( netdev );
|
||||
err_create:
|
||||
return rc;
|
||||
|
||||
Reference in New Issue
Block a user