Be more stringent on the criteria for not doing disk probes.

This bit of the nvdimm code stops HD() paths from getting generated
right sometimes.

Signed-off-by: Peter Jones <pjones@redhat.com>

diff --git a/src/creator.c b/src/creator.c
index 31f0e39..e7d172d 100644 (file)
--- a/src/creator.c
+++ b/src/creator.c
@@ -246,7 +246,8 @@ efi_va_generate_file_device_path_from_esp(uint8_t *buf, ssize_t size,
                off += sz;
        }
 
-       if (!(options & EFIBOOT_ABBREV_FILE) && info.part_name) {
+       if ((!(options & EFIBOOT_ABBREV_FILE) && info.part_name) ||
+           ((options & EFIBOOT_ABBREV_HD) && ! info.part_name)) {
                int disk_fd;
                int saved_errno;
                int rc;