regression in cryptomount -u

[Olaf Hering]

Prior commit 3cf2e848bc03 ("disk/cryptodisk: Allows UUIDs to be compared
in a dash-insensitive manner") the grub.cfg below worked as expected:
create a menu, which if selected tries to open the specified partition
and does further processing. In case the passphrase was wrong, it would
just return and offer the menu again.

With the commit above, the specified partition is opened, but cryptomount
returns an error. As a result no further processing is done, the menu is
shown again. It needs to be selected once more to do the actual processing.

This change works for me:

--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -1236,7 +1236,7 @@ grub_cryptodisk_scan_device (const char *name,
   dev = grub_cryptodisk_scan_device_real (name, source, cargs);
   if (dev)
     {
-      ret = (cargs->search_uuid != NULL && grub_strcasecmp 
(cargs->search_uuid, dev->uuid) == 0);
+      ret = cargs->search_uuid && !grub_uuidcasecmp(cargs->search_uuid, 
dev->uuid, sizeof(dev->uuid));
       goto cleanup;
     }
 


submenu x {
  insmod luks
  if cryptomount -u ${uuid_without_dashes} ; then
    do_work
  fi
}


Olaf

pgpYv2KevYscI.pgp
Description: Digitale Signatur von OpenPGP