commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[1742] 2008-07-28 Robert Millan <address@hidden>


From: Robert Millan
Subject: [1742] 2008-07-28 Robert Millan <address@hidden>
Date: Mon, 28 Jul 2008 09:25:38 +0000

Revision: 1742
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1742
Author:   robertmh
Date:     2008-07-28 09:25:37 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
2008-07-28  Robert Millan  <address@hidden>

        * 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       2008-07-27 20:57:43 UTC (rev 1741)
+++ trunk/grub2/ChangeLog       2008-07-28 09:25:37 UTC (rev 1742)
@@ -1,3 +1,9 @@
+2008-07-28  Robert Millan  <address@hidden>
+
+       * 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.
+       
 2008-07-27  Robert Millan  <address@hidden>
 
        * disk/ata.c (grub_ata_dumpinfo): Use grub_dprintf() for debugging

Modified: trunk/grub2/disk/raid.c
===================================================================
--- trunk/grub2/disk/raid.c     2008-07-27 20:57:43 UTC (rev 1741)
+++ trunk/grub2/disk/raid.c     2008-07-28 09:25:37 UTC (rev 1742)
@@ -442,16 +442,10 @@
        }
   
       if (array->device[sb.this_disk.number] != NULL)
-       {
-         /* We found multiple devices with the same number. Again,
-            this shouldn't happen.*/
-
-         grub_error (GRUB_ERR_BAD_NUMBER,
-                     "Found two disks with the number %d?!?",
+       /* We found multiple devices with the same number. Again,
+          this shouldn't happen.*/
+       grub_dprintf ("raid", "Found two disks with the number %d?!?",
                      sb.this_disk.number);
-
-         return 0;
-       }
     }
 
   /* Add an array to the list if we didn't find any.  */






reply via email to

[Prev in Thread] Current Thread [Next in Thread]