summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-06 11:15:19 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-06 11:16:23 +0200
commitcca8b7433a597970d1a463be377a3d9439a1b1cd (patch)
treeada8b766bd95fc8120981db5bc502e5029221fb0 /perl-install
parent8847eda6f7f8aaad07931290f1a37a5e44f7a426 (diff)
downloaddrakx-cca8b7433a597970d1a463be377a3d9439a1b1cd.tar
drakx-cca8b7433a597970d1a463be377a3d9439a1b1cd.tar.gz
drakx-cca8b7433a597970d1a463be377a3d9439a1b1cd.tar.bz2
drakx-cca8b7433a597970d1a463be377a3d9439a1b1cd.tar.xz
drakx-cca8b7433a597970d1a463be377a3d9439a1b1cd.zip
grub2: only overwrite install.sh when installing
And only when actually installing boot loader, not when updating grub2 menu list (mga#17455)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS1
3 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 68ce10531..2b79ce7c1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,7 @@
o enable to (un)install os-prober (mga#16010, mga#18538)
o fix reading back last grub2 entry
o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112)
+ o only overwrite install.sh when actually installing boot loader (mga#17455)
o set GRUB_DEFAULT + GRUB_SAVEDEFAULT (mga#9627, mga#16059)
o stop offering grub legacy & lilo on new installs (mga#18583)
- running commands as user:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index b6f9fcff1..a70c51f9a 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1835,7 +1835,6 @@ sub write_grub2 {
log::l("error while running grub2-set-default: $err");
}
check_enough_space();
- write_grub2_install_sh($bootloader, $o_backup_extension);
}
sub get_grub2_install_sh() {
@@ -2049,6 +2048,7 @@ sub restore_previous_MBR_bootloader {
sub install_grub2 {
my ($bootloader, $all_hds) = @_;
write_grub2($bootloader, $all_hds);
+ write_grub2_install_sh($bootloader, $o_backup_extension);
install_raw_grub2();
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c29edee58..457ceb6e9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
o enable to (un)install os-prober (mga#16010, mga#18538)
o fix reading back last grub2 entry
o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112)
+ o only overwrite install.sh when actually installing boot loader (mga#17455)
o set GRUB_DEFAULT + GRUB_SAVEDEFAULT (mga#9627, mga#16059)
o stop offering grub legacy & lilo on new installs (mga#18583)