cryptodisk: Improve error messaging in cryptomount invocations

Update such that "cryptomount -u UUID" will not print two error messages
when an invalid passphrase is given and the most relevant error message
will be displayed.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index 27491871a55513b451cf3aa912ba9ec374f118f1..3a896c6634aead3fb62c8a5be0f40c0542264e11 100644 (file)
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -1109,7 +1109,10 @@ grub_cryptodisk_scan_device (const char *name,
   if (grub_errno == GRUB_ERR_BAD_MODULE)
     grub_error_pop ();
 
-  if (grub_errno != GRUB_ERR_NONE)
+  if (search_uuid != NULL)
+    /* Push error onto stack to save for cryptomount. */
+    grub_error_push ();
+  else
     grub_print_error ();
 
  cleanup:
@@ -1146,9 +1149,19 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
       found_uuid = grub_device_iterate (&grub_cryptodisk_scan_device, NULL);
       search_uuid = NULL;
 
-      if (!found_uuid)
-       return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such cryptodisk found");
-      return GRUB_ERR_NONE;
+      if (found_uuid)
+       return GRUB_ERR_NONE;
+      else if (grub_errno == GRUB_ERR_NONE)
+       {
+         /*
+          * Try to pop the next error on the stack. If there is not one, then
+          * no device matched the given UUID.
+          */
+         grub_error_pop ();
+         if (grub_errno == GRUB_ERR_NONE)
+           return grub_error (GRUB_ERR_BAD_ARGUMENT, "no such cryptodisk found");
+       }
+      return grub_errno;
     }
   else if (state[1].set || (argc == 0 && state[2].set))
     {