summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-07-25 15:24:44 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-07-25 15:24:44 +0200
commitbca2d23304c03118e7ec5059c841647af4de10bc (patch)
treea42438817779595898b0b2b0e3adaa705de0efcb /perl-install
parent9ff0f0860cab4b3622a65d5b0a1d6c53d756ef63 (diff)
downloaddrakx-bca2d23304c03118e7ec5059c841647af4de10bc.tar
drakx-bca2d23304c03118e7ec5059c841647af4de10bc.tar.gz
drakx-bca2d23304c03118e7ec5059c841647af4de10bc.tar.bz2
drakx-bca2d23304c03118e7ec5059c841647af4de10bc.tar.xz
drakx-bca2d23304c03118e7ec5059c841647af4de10bc.zip
fix .old backup for grub2's grub.cfg
rationale: write_*() takes (bootloader, all_hd, ext) as parameters (when called from installkernel -> bootloader-config and then only when migrating to uuids as we don't care for 2 first for grub2, just ignore the 3rd too
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm5
-rw-r--r--perl-install/install/NEWS3
3 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e7d665e26..e74a7d043 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o fix .old backup for grub2's grub.cfg
+
Version 17.52 - 17 July 2016
- drakboot:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index b99db9f83..2451df253 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1903,12 +1903,11 @@ sub write_grub2_default_entry {
}
}
-sub write_grub2 {
- my ($o_backup_extension) = @_;
+sub write_grub2() {
my $error;
my $f1 = "$::prefix/boot/grub2/grub.cfg";
- renamef($f1, $f1 . ($o_backup_extension || '.old'));
+ renamef($f1, $f1 . '.old');
run_program::rooted($::prefix, 'update-grub2', '2>', \$error) or die "update-grub2 failed: $error";
log::l("update-grub2 logs: $error");
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 93f81aa8c..83e1e0380 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader configuration:
+ o fix .old backup for grub2's grub.cfg
+
Version 17.52 - 17 July 2016
- do not preinstall mageia-gfxboot-theme