Skip to content

Commit

Permalink
[autoboot] Fix incorrect boolean logic
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mcb30 committed Jan 19, 2016
1 parent 207edc4 commit 3c26ffa
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/usr/autoboot.c
Expand Up @@ -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;
Expand Down

0 comments on commit 3c26ffa

Please sign in to comment.