diff options
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 1 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 40d960267..f83016b9c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,6 +1,8 @@ - diskdrake: o fix mnt point for FAT partitions on GTP (mga#15987) o set the proper GUID for FAT partitions on GPT +- drakboot: + o do not detect grub2 on UEFI when there's no bootloader Version 16.98 - 19 May 2015 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} = []; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 84a59ba2d..7001c0ba1 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- bootloader: + o do not detect grub2 on UEFI when there's no bootloader - partitioning: o fix mnt point for FAT partitions on GTP (mga#15987) o set the proper GUID for FAT partitions on GPT |