summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-24 15:41:05 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-24 15:46:18 +0200
commit4f8bd54ef3c34a5bb33a9d5973c0393a652ce882 (patch)
treefbf7bb2740488a31adc528d2904e3754119312c7
parent8be6d47def0dd9bf8746f79d2e66cdf11bec07f4 (diff)
downloaddrakx-4f8bd54ef3c34a5bb33a9d5973c0393a652ce882.tar
drakx-4f8bd54ef3c34a5bb33a9d5973c0393a652ce882.tar.gz
drakx-4f8bd54ef3c34a5bb33a9d5973c0393a652ce882.tar.bz2
drakx-4f8bd54ef3c34a5bb33a9d5973c0393a652ce882.tar.xz
drakx-4f8bd54ef3c34a5bb33a9d5973c0393a652ce882.zip
(write_grub2_sysconfig) split it
needed for next commit
-rw-r--r--perl-install/bootloader.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 4cb72fb0c..6f4c4cd7e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1854,9 +1854,8 @@ sub crypt_grub2_password {
chomp_($res);
}
-sub write_grub2 {
+sub write_grub2_sysconfig {
my ($bootloader, $_all_hds, $o_backup_extension) = @_;
- my $error;
# Set password prior to run update-grub2:
my $pw_f = get_grub2_users();
@@ -1883,6 +1882,13 @@ sub write_grub2 {
$conf{GRUB_TIMEOUT} = $bootloader->{timeout};
renamef($f, $f . ($o_backup_extension || '.old'));
setVarsInSh($f, \%conf);
+}
+
+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'));