]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
* grub-core/disk/cryptodisk.c (grub_cryptodisk_scan_device): Don't stop
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 4 Feb 2013 14:36:03 +0000 (15:36 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 4 Feb 2013 14:36:03 +0000 (15:36 +0100)
on first error.

ChangeLog
grub-core/disk/cryptodisk.c

index f5396fe7937a82214491a7aaf85e498d29d17a5f..0994ee716b87ec3fcb2f7bd6454641a0b8ef5083 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/cryptodisk.c (grub_cryptodisk_scan_device): Don't stop
+       on first error.
+
 2013-02-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/fshelp.c (find_file): Set oldnode to zero after
index ce755c3a2e9983885814a07ca86edbc1018243ed..f39c1ab011f17a1151ae4bb80e9382e30cdc0c9b 100644 (file)
@@ -875,7 +875,10 @@ grub_cryptodisk_scan_device (const char *name,
   /* Try to open disk.  */
   source = grub_disk_open (name);
   if (!source)
-    return grub_errno;
+    {
+      grub_print_error ();
+      return 0;
+    }
 
   err = grub_cryptodisk_scan_device_real (name, source);