From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 19 Jan 2016 08:16:17 +0000 (+0000)
Subject: [autoboot] Fix incorrect boolean logic
X-Git-Tag: v1.20.1~623
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c26ffafceef176286c108fe2b01ccebd83062a0;p=thirdparty%2Fipxe.git

[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>
---

diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 8c6b6904e..e93b0150d 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -379,8 +379,8 @@ int netboot ( struct net_device *netdev ) {
 	 * it may represent an NFS root.
 	 */
 	if ( filename && root_path &&
-	     ( ! ( uri_is_absolute ( root_path ) ||
-		   ( xfer_uri_opener ( root_path->scheme ) == NULL ) ) ) ) {
+	     ( ( ! uri_is_absolute ( root_path ) ) ||
+	       ( xfer_uri_opener ( root_path->scheme ) == NULL ) ) ) {
 		printf ( "Ignoring unsupported root path\n" );
 		uri_put ( root_path );
 		root_path = NULL;