Selaa lähdekoodia

[autoboot] Fix incorrect boolean logic

Commit 53d2d9e ("[uri] Generalise tftp_uri() to pxe_uri()") introduced
a regression in which an NFS root path would no longer be treated as
an unsupported root path, causing a boot with an NFS root path to fail
with a "Could not open SAN device" error.

Reported-by: David Evans <dave.evans55@googlemail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 8 vuotta sitten
vanhempi
commit
3c26ffafce
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2
    2
      src/usr/autoboot.c

+ 2
- 2
src/usr/autoboot.c Näytä tiedosto

@@ -379,8 +379,8 @@ int netboot ( struct net_device *netdev ) {
379 379
 	 * it may represent an NFS root.
380 380
 	 */
381 381
 	if ( filename && root_path &&
382
-	     ( ! ( uri_is_absolute ( root_path ) ||
383
-		   ( xfer_uri_opener ( root_path->scheme ) == NULL ) ) ) ) {
382
+	     ( ( ! uri_is_absolute ( root_path ) ) ||
383
+	       ( xfer_uri_opener ( root_path->scheme ) == NULL ) ) ) {
384 384
 		printf ( "Ignoring unsupported root path\n" );
385 385
 		uri_put ( root_path );
386 386
 		root_path = NULL;

Loading…
Peruuta
Tallenna