[1809] 2008-08-16 Robert Millan <[email protected]>

Revision: 1809
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1809
Author:   robertmh
Date:     2008-08-16 12:52:34 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
2008-08-16  Robert Millan  <[email protected]>

        * disk/raid.c (grub_raid_init): Handle/report errors set by
        grub_device_iterate().
        * disk/lvm.c (grub_lvm_init): Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/disk/lvm.c
    trunk/grub2/disk/raid.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2008-08-15 15:39:02 UTC (rev 1808)
+++ trunk/grub2/ChangeLog	2008-08-16 12:52:34 UTC (rev 1809)
@@ -1,3 +1,9 @@
+2008-08-16  Robert Millan  <[email protected]>
+
+	* disk/raid.c (grub_raid_init): Handle/report errors set by
+	grub_device_iterate().
+	* disk/lvm.c (grub_lvm_init): Likewise.
+
 2008-08-15  Bean  <[email protected]>
 
 	* conf/i386-pc.rmk (pkglib_MODULES): Add datetime.mod, date.mod

Modified: trunk/grub2/disk/lvm.c
===================================================================
--- trunk/grub2/disk/lvm.c	2008-08-15 15:39:02 UTC (rev 1808)
+++ trunk/grub2/disk/lvm.c	2008-08-16 12:52:34 UTC (rev 1809)
@@ -586,6 +586,12 @@
 GRUB_MOD_INIT(lvm)
 {
   grub_device_iterate (&grub_lvm_scan_device);
+  if (grub_errno)
+    {
+      grub_print_error ();
+      grub_errno = GRUB_ERR_NONE;
+    }
+
   grub_disk_dev_register (&grub_lvm_dev);
 }
 

Modified: trunk/grub2/disk/raid.c
===================================================================
--- trunk/grub2/disk/raid.c	2008-08-15 15:39:02 UTC (rev 1808)
+++ trunk/grub2/disk/raid.c	2008-08-16 12:52:34 UTC (rev 1809)
@@ -580,6 +580,12 @@
 GRUB_MOD_INIT(raid)
 {
   grub_device_iterate (&grub_raid_scan_device);
+  if (grub_errno)
+    {
+      grub_print_error ();
+      grub_errno = GRUB_ERR_NONE;
+    }
+
   grub_disk_dev_register (&grub_raid_dev);
 }