diff options
| author | Pascal Terjan <pterjan@gmail.com> | 2014-09-01 14:12:03 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@gmail.com> | 2014-10-20 21:29:56 +0000 |
| commit | fb5ed803ca2ce58117b8bf97a9717cab766b0d71 (patch) | |
| tree | f5f62342532aa3072e6ba3dba301744190d1b162 | |
| parent | 0ecc318a668efc5b43711ec1a3101560e30eb407 (diff) | |
| download | drakx-fb5ed803ca2ce58117b8bf97a9717cab766b0d71.tar drakx-fb5ed803ca2ce58117b8bf97a9717cab766b0d71.tar.gz drakx-fb5ed803ca2ce58117b8bf97a9717cab766b0d71.tar.bz2 drakx-fb5ed803ca2ce58117b8bf97a9717cab766b0d71.tar.xz drakx-fb5ed803ca2ce58117b8bf97a9717cab766b0d71.zip | |
Only allow GRUB2 when booting on btrfs
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 9d9037114..31c900156 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- only allow GRUB2 when booting on btrfs + Version 16.41 - 31 August 2014 - add packages to wanted_hardware_packages list to prevent them being removed: diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 885c30dfa..7ca1fdbf5 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1270,8 +1270,8 @@ sub method_choices { my $have_dmraid = find { fs::type::is_dmraid($_) } @{$all_hds->{hds}}; grep { - !(/lilo/ && (isLoopback($root_part) || $have_dmraid || - $boot_part->{fs_type} eq 'btrfs')) + !(/lilo/ && (isLoopback($root_part) || $have_dmraid)) + && (/grub2/ || $boot_part->{fs_type} ne 'btrfs') && !(/grub-graphic/ && cat_("/proc/cmdline") =~ /console=ttyS/); } method_choices_raw($b_prefix_mounted); } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 86623cd8a..e9a058c67 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- only allow GRUB2 when booting on btrfs + Version 16.41 - 31 August 2014 - adapt to latest systemd |