From 3c26ffafceef176286c108fe2b01ccebd83062a0 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 19 Jan 2016 08:16:17 +0000 Subject: [PATCH] [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 Signed-off-by: Michael Brown --- src/usr/autoboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.47.3