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

        * util/i386/pc/grub-setup.c (main): If install drive is an LVM,
        don't append the RAID prefix afterwards.
        Reported by Clint Adams.

diff --git a/ChangeLog b/ChangeLog
index 48cced2eafe522d342aa62c1b774e0b7eeee1e98..3f3230e92286c9f5cd152ae13ec557c8ebe8c2d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-08  Robert Millan  <rmh@aybabtu.com>
+
+       * util/i386/pc/grub-setup.c (main): If install drive is an LVM,
+       don't append the RAID prefix afterwards.
+       Reported by Clint Adams.
+
 2008-06-08  Robert Millan  <rmh@aybabtu.com>
 
        Based on description from Pavel:

diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 535a8d0e2a16d0a910ea93ebcb2d6a712f55b704..3438781496f66bf5d16b29d4cf50cda10ca9ebd1 100644 (file)
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -749,9 +749,8 @@ main (int argc, char *argv[])
       free (prefix);
       prefix = newprefix;
     }
-    
-  if (dest_dev[0] == 'm' && dest_dev[1] == 'd'
-      && dest_dev[2] >= '0' && dest_dev[2] <= '9')
+  else if (dest_dev[0] == 'm' && dest_dev[1] == 'd'
+          && dest_dev[2] >= '0' && dest_dev[2] <= '9')
     {
       char **devicelist;
       char *raid_prefix;