[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2056] 2009-04-01 Robert Millan <address@hidden>
From: |
Robert Millan |
Subject: |
[2056] 2009-04-01 Robert Millan <address@hidden> |
Date: |
Wed, 01 Apr 2009 01:26:58 +0000 |
Revision: 2056
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2056
Author: robertmh
Date: 2009-04-01 01:26:58 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
2009-04-01 Robert Millan <address@hidden>
Reapply fix from 2008-07-28 which was accidentally reverted; also
perform the same fix to a similar check in same function.
* disk/raid.c (grub_raid_scan_device): Do not abort when two disks
with the same number are found, just use issue a warning with
grub_dprintf(), as this error has been reported to be non-fatal.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/disk/raid.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-04-01 01:09:30 UTC (rev 2055)
+++ trunk/grub2/ChangeLog 2009-04-01 01:26:58 UTC (rev 2056)
@@ -1,3 +1,12 @@
+2009-04-01 Robert Millan <address@hidden>
+
+ Reapply fix from 2008-07-28 which was accidentally reverted; also
+ perform the same fix to a similar check in same function.
+
+ * disk/raid.c (grub_raid_scan_device): Do not abort when two disks
+ with the same number are found, just use issue a warning with
+ grub_dprintf(), as this error has been reported to be non-fatal.
+
2009-03-31 Pavel Roskin <address@hidden>
* aclocal.m4 (grub_I386_CHECK_REGPARM_BUG): Provide safe default
Modified: trunk/grub2/disk/raid.c
===================================================================
--- trunk/grub2/disk/raid.c 2009-04-01 01:09:30 UTC (rev 2055)
+++ trunk/grub2/disk/raid.c 2009-04-01 01:26:58 UTC (rev 2056)
@@ -495,18 +495,15 @@
if (array->total_devs == array->nr_devs)
/* We found more members of the array than the array
actually has according to its superblock. This shouldn't
- happen normally, but what is the sanest things to do in such
- a case? */
- return grub_error (GRUB_ERR_BAD_NUMBER,
- "array->nr_devs > array->total_devs (%d)?!?",
- array->total_devs);
+ happen normally. */
+ grub_dprintf ("raid", "array->nr_devs > array->total_devs (%d)?!?",
+ array->total_devs);
if (array->device[new_array->index] != NULL)
/* We found multiple devices with the same number. Again,
this shouldn't happen.*/
- return grub_error (GRUB_ERR_BAD_NUMBER,
- "Found two disks with the number %d?!?",
- new_array->number);
+ grub_dprintf ("raid", "Found two disks with the number %d?!?",
+ new_array->number);
if (new_array->disk_size < array->disk_size)
array->disk_size = new_array->disk_size;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2056] 2009-04-01 Robert Millan <address@hidden>,
Robert Millan <=