2008-08-16 Robert Millan <rmh@aybabtu.com>

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

diff --git a/ChangeLog b/ChangeLog
index 7473bd320cc0211bac0009f1b05d89e3740fd9e1..f43a275c915bb68091795eb388095de2769a76c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-16  Robert Millan  <rmh@aybabtu.com>
+
+       * 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  <bean123ch@gmail.com>
 
        * conf/i386-pc.rmk (pkglib_MODULES): Add datetime.mod, date.mod

diff --git a/disk/lvm.c b/disk/lvm.c
index 6a05caa752807cc9bd064f36ac7e0c5a9081c473..cd9e44751b68581db34f3280dda559d6b8a43a13 100644 (file)
--- a/disk/lvm.c
+++ b/disk/lvm.c
@@ -586,6 +586,12 @@ static struct grub_disk_dev grub_lvm_dev =
 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);
 }
 

diff --git a/disk/raid.c b/disk/raid.c
index 163bd81596c9c46436ba4ca69714cb451ba3aab7..7aa2398fca23a74815a5e19bf5155948c5f31b3b 100644 (file)
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -580,6 +580,12 @@ static struct grub_disk_dev grub_raid_dev =
 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);
 }