summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2017-03-19 03:52:49 +0100
committerThomas Backlund <tmb@mageia.org>2018-01-09 23:02:32 +0200
commita2594a936ea91a08881cb40e056f1407065a2ee6 (patch)
tree2f9134be60f6e28856a9917a5e13a2d6ca74b2af
parent6fb73fba36f9fcf88251f3bd3ad8ee67950c8541 (diff)
downloaddrakx-a2594a936ea91a08881cb40e056f1407065a2ee6.tar
drakx-a2594a936ea91a08881cb40e056f1407065a2ee6.tar.gz
drakx-a2594a936ea91a08881cb40e056f1407065a2ee6.tar.bz2
drakx-a2594a936ea91a08881cb40e056f1407065a2ee6.tar.xz
drakx-a2594a936ea91a08881cb40e056f1407065a2ee6.zip
Revert "do not alter /etc/default/grub on kernel updates"
-rw-r--r--perl-install/bootloader.pm10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index aa38f1326..d53807d09 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1896,14 +1896,18 @@ sub write_grub2_default_entry {
}
}
-sub write_grub2() {
+sub write_grub2 {
+ my ($bootloader, $o_all_hds, $o_backup_extension) = @_;
my $error;
+ write_grub2_sysconfig($bootloader, $o_all_hds, $o_backup_extension);
+
my $f1 = "$::prefix/boot/grub2/grub.cfg";
renamef($f1, $f1 . '.old');
run_program::rooted($::prefix, 'update-grub2', '2>', \$error) or die "update-grub2 failed: $error";
log::l("update-grub2 logs: $error");
+ write_grub2_default_entry($bootloader, $o_all_hds, $o_backup_extension);
check_enough_space();
}
@@ -2122,9 +2126,7 @@ sub restore_previous_MBR_bootloader {
sub install_grub2 {
my ($bootloader, $all_hds) = @_;
- write_grub2_sysconfig($bootloader, $all_hds);
- write_grub2();
- write_grub2_default_entry($bootloader, $all_hds);
+ write_grub2($bootloader, $all_hds);
write_grub2_install_sh($bootloader, '.old');
install_raw_grub2();
}