From 27cd1f5359c4f5ff519af2b3990a575516fd3659 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 27 Feb 2013 17:44:22 +0000
Subject: try harder not to have duplicate stuff on grub2 cmd line

---
 perl-install/bootloader.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

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);
-- 
cgit v1.2.1