From f2156fda692afad79f34d5b54a20cfee4bc800bd Mon Sep 17 00:00:00 2001 From: robertmh Date: Thu, 7 Feb 2008 12:46:45 +0000 Subject: [PATCH] 2008-02-07 Robert Millan Patch from Jeroen Dekkers. * disk/raid.c (grub_raid_scan_device): Reset `grub_errno' on disk failure, since succesfuly reading all array members might not be required. --- ChangeLog | 7 +++++++ disk/raid.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d826595ce..5904dd993 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-07 Robert Millan + + Patch from Jeroen Dekkers. + * disk/raid.c (grub_raid_scan_device): Reset `grub_errno' on disk + failure, since succesfuly reading all array members might not be + required. + 2008-02-06 Robert Millan * util/grub-probe.c (probe): Simplify partmap probing (with the diff --git a/disk/raid.c b/disk/raid.c index d5015e047..db7bb98d2 100644 --- a/disk/raid.c +++ b/disk/raid.c @@ -343,7 +343,10 @@ grub_raid_scan_device (const char *name) err = grub_disk_read (disk, sector, 0, GRUB_RAID_SB_BYTES, (char *) &sb); grub_disk_close (disk); if (err) - return 0; + { + grub_errno = GRUB_ERR_NONE; + return 0; + } /* Look whether there is a RAID superblock. */ if (sb.md_magic != GRUB_RAID_SB_MAGIC)