From c35a2b86abf97d731357119fafda7db4670e35ca Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 15 Jan 2005 18:42:06 +0000
Subject: in read_grub(), setting {table} cause write_grub to create a
 {mapdrive} even when we didn't have one (bugzilla #12307)

---
 perl-install/bootloader.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install/bootloader.pm')

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 437c7779c..a8265f61d 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -212,16 +212,16 @@ sub read_grub {
 		$e->{kernel_or_dev} = grub2file($kernel, $grub2dev, $fstab);
             } elsif ($keyword eq 'root') {
                 $e->{type} = 'other';
-		if ($v =~ /,/) {
-		    $e->{table} = grub2dev($v, $grub2dev, 1);
-		} else {
+		if ($v !~ /,/) {
 		    $e->{unsafe} = 1;
 		}
                 $e->{kernel_or_dev} = grub2dev($v, $grub2dev);
                 $e->{append} = "";
             } elsif ($keyword eq 'initrd') {
                 $e->{initrd} = grub2file($v, $grub2dev, $fstab);
-            }
+            } elsif ($keyword eq 'map') {
+		$e->{mapdrive}{$2} = $1 if $v =~ m/\((.*)\) \((.*)\)/;
+	    }
         }
     }
     foreach (cat_("$::prefix/boot/grub/install.sh")) {
-- 
cgit v1.2.1