diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-02-27 17:44:22 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-02-27 17:44:22 +0000 |
| commit | 27cd1f5359c4f5ff519af2b3990a575516fd3659 (patch) | |
| tree | 598427eff40fc8b8304308893e8dac1cc53cb195 | |
| parent | 17e0446be129455d16c02375d9482f0fe4ea6e64 (diff) | |
| download | drakx-27cd1f5359c4f5ff519af2b3990a575516fd3659.tar drakx-27cd1f5359c4f5ff519af2b3990a575516fd3659.tar.gz drakx-27cd1f5359c4f5ff519af2b3990a575516fd3659.tar.bz2 drakx-27cd1f5359c4f5ff519af2b3990a575516fd3659.tar.xz drakx-27cd1f5359c4f5ff519af2b3990a575516fd3659.zip | |
try harder not to have duplicate stuff on grub2 cmd line
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 2728b132e..4698afb18 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - drakboot: o allow installing grub2 on a partition (mga#8462) + o try harder not to have duplicate stuff on grub2 cmd line Version 15.23 - 27 February 2013 diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 2512842a2..2c7abf830 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1800,8 +1800,9 @@ sub write_grub2 { # set default parameters: my ($entry) = grep { $_->{kernel_or_dev} =~ /vmlin/ } @{$bootloader->{entries}}; my $append = $entry->{append}; - $append =~ s/root=\S+//; - $append =~ s/\bro\b//; + $append =~ s/root=\S+//g; + $append =~ s/\bro\b//g; + $append =~ s/\s+/ /g; my $f = "$::prefix/etc/default/grub"; my %conf = getVarsFromSh($f); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 7c0aaac2e..accaa9783 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - bootloader: o allow installing grub2 on a partition (mga#8462) + o try harder not to have duplicate stuff on grub2 cmd line Version 15.23 - 27 February 2013 |