diff options
| author | Toomas Soome <tsoome@me.com> | 2019-04-07 16:58:11 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-05-14 06:01:27 +0300 |
| commit | 76eff6ad4aa646f8d8aa38f7dda4824170170280 (patch) | |
| tree | 9fc0348b6e38f6bc41bcf6d9d878882f7dbd73aa | |
| parent | 3db6627c6730f7ec4426ac0be0e9338235aed2d8 (diff) | |
| download | illumos-joyent-76eff6ad4aa646f8d8aa38f7dda4824170170280.tar.gz | |
10929 loader: efi_zfs_is_preferred: was && intended here instead of ||
Reviewed by: Gergő Doma <domag02@gmail.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/boot/sys/boot/efi/loader/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/boot/sys/boot/efi/loader/main.c b/usr/src/boot/sys/boot/efi/loader/main.c index 0bc0dcdb80..2cb24357af 100644 --- a/usr/src/boot/sys/boot/efi/loader/main.c +++ b/usr/src/boot/sys/boot/efi/loader/main.c @@ -96,8 +96,8 @@ efi_zfs_is_preferred(EFI_HANDLE *h) node = efi_devpath_last_node(devpath); if (node == NULL) return (false); - if (DevicePathType(node) != MEDIA_DEVICE_PATH && - (DevicePathSubType(node) != MEDIA_FILEPATH_DP || + if (DevicePathType(node) != MEDIA_DEVICE_PATH || + (DevicePathSubType(node) != MEDIA_FILEPATH_DP && DevicePathSubType(node) != MEDIA_HARDDRIVE_DP)) { return (false); } |