summaryrefslogtreecommitdiffstats
path: root/perl-install/bootloader.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-27 06:40:09 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-27 06:40:09 +0000
commit3a913ec6ded72b88ba56c2b88c6cd324b15ea771 (patch)
treeeaa056381dbfcc85cb0657889ca3de8ef92df61f /perl-install/bootloader.pm
parentbdf52b0e98b2e5ddd24e0fc778f10a433d69377b (diff)
downloaddrakx-backup-do-not-use-3a913ec6ded72b88ba56c2b88c6cd324b15ea771.tar
drakx-backup-do-not-use-3a913ec6ded72b88ba56c2b88c6cd324b15ea771.tar.gz
drakx-backup-do-not-use-3a913ec6ded72b88ba56c2b88c6cd324b15ea771.tar.bz2
drakx-backup-do-not-use-3a913ec6ded72b88ba56c2b88c6cd324b15ea771.tar.xz
drakx-backup-do-not-use-3a913ec6ded72b88ba56c2b88c6cd324b15ea771.zip
set default parameters in grub2 config (mga#9177)
Diffstat (limited to 'perl-install/bootloader.pm')
-rw-r--r--perl-install/bootloader.pm12
1 files changed, 12 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index f7d13ac5c..0a3363d52 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1794,6 +1794,18 @@ sub crypt_grub_password {
sub write_grub2 {
my ($bootloader, $_all_hds, $o_backup_extension) = @_;
my $error;
+
+ # set default parameters:
+ my ($entry) = grep { $_->{kernel_or_dev} =~ /vmlin/ } @{$bootloader->{entries}};
+ my $append = $entry->{append};
+ $append =~ s/root=\S+//;
+ $append =~ s/\bro\b//;
+
+ my $f = "$::prefix/etc/default/grub";
+ my %conf = getVarsFromSh($f);
+ $conf{GRUB_CMDLINE_LINUX_DEFAULT} = $append;
+ setVarsInSh($f, \%conf);
+
my $grub2_cfg = '/boot/grub2/grub.cfg';
run_program::rooted($::prefix, 'grub2-mkconfig', '2>', \$error, '-o', $grub2_cfg) or die "grub2-mkconfig failed: $error";
}