From 1082b929e36c67677cee0fd3d5215554a0e5a878 Mon Sep 17 00:00:00 2001 From: robertmh Date: Sat, 16 Aug 2008 12:52:34 +0000 Subject: [PATCH] 2008-08-16 Robert Millan * disk/raid.c (grub_raid_init): Handle/report errors set by grub_device_iterate(). * disk/lvm.c (grub_lvm_init): Likewise. --- ChangeLog | 6 ++++++ disk/lvm.c | 6 ++++++ disk/raid.c | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7473bd320..f43a275c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-16 Robert Millan + + * 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 * conf/i386-pc.rmk (pkglib_MODULES): Add datetime.mod, date.mod diff --git a/disk/lvm.c b/disk/lvm.c index 6a05caa75..cd9e44751 100644 --- 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 163bd8159..7aa2398fc 100644 --- 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); }