summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-15 18:42:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-15 18:42:06 +0000
commitc35a2b86abf97d731357119fafda7db4670e35ca (patch)
tree500d670849aa2e66957785b4cc81028ff2220a9b
parent23ebeb6af4ece1c8d97120a327976cef695f2836 (diff)
downloaddrakx-c35a2b86abf97d731357119fafda7db4670e35ca.tar
drakx-c35a2b86abf97d731357119fafda7db4670e35ca.tar.gz
drakx-c35a2b86abf97d731357119fafda7db4670e35ca.tar.bz2
drakx-c35a2b86abf97d731357119fafda7db4670e35ca.tar.xz
drakx-c35a2b86abf97d731357119fafda7db4670e35ca.zip
in read_grub(), setting {table} cause write_grub to create a {mapdrive} even when we didn't have one (bugzilla #12307)
-rw-r--r--perl-install/bootloader.pm8
1 files changed, 4 insertions, 4 deletions
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")) {