diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-24 15:49:14 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-24 17:49:08 +0200 |
| commit | 7bb01fb038e0a882e755b963110bda381336b748 (patch) | |
| tree | 4a46732ad4f6e84872d5011e2ffceedf021ff805 | |
| parent | 302a992cc5fed524f62416d74308ec400343884a (diff) | |
| download | drakx-7bb01fb038e0a882e755b963110bda381336b748.tar drakx-7bb01fb038e0a882e755b963110bda381336b748.tar.gz drakx-7bb01fb038e0a882e755b963110bda381336b748.tar.bz2 drakx-7bb01fb038e0a882e755b963110bda381336b748.tar.xz drakx-7bb01fb038e0a882e755b963110bda381336b748.zip | |
do not alter /etc/default/grub on kernel updates
only when running drakboot (mga#18783)
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 628b7f1e3..71176a08a 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- drakboot: + o do not alter /etc/default/grub on kernel updates, only when running + drakboot (mga#18783) + Version 17.45 - 24 June 2016 - diskdrake: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index bd615c02e..61d69627e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1909,14 +1909,11 @@ 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 . ($o_backup_extension || '.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(); } @@ -2135,7 +2132,9 @@ sub restore_previous_MBR_bootloader { sub install_grub2 { my ($bootloader, $all_hds) = @_; + write_grub2_sysconfig($bootloader, $all_hds); write_grub2($bootloader, $all_hds); + write_grub2_default_entry($bootloader, $all_hds); write_grub2_install_sh($bootloader, '.old'); install_raw_grub2(); } |