diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-06-26 08:32:58 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-06-26 08:32:58 +0000 |
| commit | b5b516e1614b96774fa387972d14cc20243b5607 (patch) | |
| tree | 935c536a2740a5cc20aa08bdad158d009c5f5948 | |
| parent | a53fca509b061e53eb3ac8fb367c7925168a118e (diff) | |
| download | drakx-b5b516e1614b96774fa387972d14cc20243b5607.tar drakx-b5b516e1614b96774fa387972d14cc20243b5607.tar.gz drakx-b5b516e1614b96774fa387972d14cc20243b5607.tar.bz2 drakx-b5b516e1614b96774fa387972d14cc20243b5607.tar.xz drakx-b5b516e1614b96774fa387972d14cc20243b5607.zip | |
(write_grub) fix root when using labels and switching from LILO to GRUB
| -rw-r--r-- | perl-install/bootloader.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 80bf67880..e97395979 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1268,9 +1268,11 @@ sub write_grub { if ($_->{type} eq "image") { my $vga = $_->{vga} || $bootloader->{vga}; + my $root = $_->{root}; + $root =~ s/"//g; push @conf, $title, join(' ', 'kernel', $file2grub->($_->{kernel_or_dev}), - if_($_->{root}, $_->{root} =~ /loop7/ ? "root=707" : "root=$_->{root}"), #- special to workaround bug in kernel (see #ifdef CONFIG_BLK_DEV_LOOP) + if_($root, $root =~ /loop7/ ? "root=707" : "root=$root"), #- special to workaround bug in kernel (see #ifdef CONFIG_BLK_DEV_LOOP) $_->{append}, if_($_->{'read-write'}, 'rw'), if_($vga && $vga ne "normal", "vga=$vga")); |