From: robertmh <robertmh@localhost>
Date: Sun, 8 Jun 2008 22:54:34 +0000 (+0000)
Subject: 2008-06-08  Robert Millan  <rmh@aybabtu.com>
X-Git-Tag: 1.98~1492
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5679726cdeacec0d9bcd399523adaca0fd2664b;p=thirdparty%2Fgrub.git

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 48cced2ea..3f3230e92 100644
--- 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 535a8d0e2..343878149 100644
--- 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;