diff options
| author | Michael Brown | 2016-01-19 09:16:17 +0100 |
|---|---|---|
| committer | Michael Brown | 2016-01-19 09:16:17 +0100 |
| commit | 3c26ffafceef176286c108fe2b01ccebd83062a0 (patch) | |
| tree | 21f3d15152e6ab0fd5257f8e77f36ade1e86844a /src/usr | |
| parent | [smsc95xx] Reserve headroom in received packets (diff) | |
| download | ipxe-3c26ffafceef176286c108fe2b01ccebd83062a0.tar.gz ipxe-3c26ffafceef176286c108fe2b01ccebd83062a0.tar.xz ipxe-3c26ffafceef176286c108fe2b01ccebd83062a0.zip | |
[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>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/autoboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c index 8c6b6904..e93b0150 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; |