summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-24 18:31:50 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-24 18:31:50 +0000
commit0fc04062eda5f5143a5f5ad7916b4aaf02042285 (patch)
treeadeae61183115ee037a7834a4413fdd1dfc84764
parent511e015add38ac9be2946e075837380497224110 (diff)
downloaddrakx-0fc04062eda5f5143a5f5ad7916b4aaf02042285.tar
drakx-0fc04062eda5f5143a5f5ad7916b4aaf02042285.tar.gz
drakx-0fc04062eda5f5143a5f5ad7916b4aaf02042285.tar.bz2
drakx-0fc04062eda5f5143a5f5ad7916b4aaf02042285.tar.xz
drakx-0fc04062eda5f5143a5f5ad7916b4aaf02042285.zip
(suggest_onmbr) suggests MBR by default for grub2 too (Manuel Hiebel, #8851)
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index cecd5aa4c..f15db5f51 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -556,7 +556,7 @@ sub suggest_onmbr {
if (my $type = partition_table::raw::typeOfMBR($hd->{device})) {
if (member($type, qw(dos dummy empty))) {
$unsafe = 0;
- } elsif (!member($type, qw(lilo grub))) {
+ } elsif (!member($type, qw(lilo grub grub2))) {
$onmbr = 0;
}
log::l("bootloader::suggest_onmbr: type $type, onmbr $onmbr, unsafe $unsafe");
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index eda7aba32..b5a4a2bfc 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- summary:
+ o suggests MBR by default for grub2 too (Manuel Hiebel, #8851)
o prevent installing grub2 somewhere else than MBR
- always bypass blkid cache (the cache only includes a subset of the data we need)