diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-20 05:54:13 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-20 18:34:47 +0200 |
| commit | ab9277b3b0dd782ac099399b229e43f42da76952 (patch) | |
| tree | 60c85ad624a9fec8ca4fca43b6bb3785aeb73acf /perl-install/bootloader.pm | |
| parent | b392299c4d0c391cf5d55479bd1ebca43cbec8c3 (diff) | |
| download | drakx-ab9277b3b0dd782ac099399b229e43f42da76952.tar drakx-ab9277b3b0dd782ac099399b229e43f42da76952.tar.gz drakx-ab9277b3b0dd782ac099399b229e43f42da76952.tar.bz2 drakx-ab9277b3b0dd782ac099399b229e43f42da76952.tar.xz drakx-ab9277b3b0dd782ac099399b229e43f42da76952.zip | |
do not wrongly detect grub2 on UEFI
when there's actually no bootloader installed
rationale: grub2 is detected if both grub.cfg & install.sh exist
Diffstat (limited to 'perl-install/bootloader.pm')
| -rw-r--r-- | perl-install/bootloader.pm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 99cfcec3a..08872ec90 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -295,6 +295,7 @@ sub read_grub2() { if (is_empty_hash_ref(\%bootloader)) { %bootloader = read_grub2_install_sh(); } + return if is_empty_hash_ref(\%bootloader) & !-s "$::prefix/boot/grub2/grub.cfg"; my %h = getVarsFromSh("$::prefix/etc/default/grub"); $bootloader{timeout} = $h{GRUB_TIMEOUT}; $bootloader{entries} = []; |