summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@redhat.com>2016-05-31 19:14:21 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-06 10:35:49 +0200
commitc9eb5ee182d8cec12c9b17aa85dcac72bacf4b5f (patch)
treef73648c0459f40f78e4daa8f867b470b7460a542
parentaf74c75a0e05575958e8706fd33bd2d34b533c59 (diff)
downloaddrakx-c9eb5ee182d8cec12c9b17aa85dcac72bacf4b5f.tar
drakx-c9eb5ee182d8cec12c9b17aa85dcac72bacf4b5f.tar.gz
drakx-c9eb5ee182d8cec12c9b17aa85dcac72bacf4b5f.tar.bz2
drakx-c9eb5ee182d8cec12c9b17aa85dcac72bacf4b5f.tar.xz
drakx-c9eb5ee182d8cec12c9b17aa85dcac72bacf4b5f.zip
introduce get_grub2_install_sh()
(needed for next commit)
-rw-r--r--perl-install/bootloader.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 0d8a7c243..247125b28 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -329,7 +329,7 @@ sub read_grub2() {
}
sub read_grub2_install_sh() {
- my $s = cat_("$::prefix/boot/grub2/install.sh");
+ my $s = cat_(get_grub2_install_sh());
my %h;
if ($s =~ m!(/dev/\S+)!m) {
$h{boot} = $1;
@@ -1830,9 +1830,13 @@ sub write_grub2 {
write_grub2_install_sh($bootloader, $o_backup_extension);
}
+sub get_grub2_install_sh() {
+ "$::prefix/boot/grub2/install.sh";
+}
+
sub write_grub2_install_sh {
my ($bootloader, $o_backup_extension) = @_;
- my $f = "$::prefix/boot/grub2/install.sh";
+ my $f = get_grub2_install_sh();
my $boot = $bootloader->{boot};
my @options;
if (is_uefi()) {