diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-04-06 19:58:47 +0259 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-04-06 19:58:47 +0259 |
| commit | 8ffb546708149e582a2fb92efbff948de88ed800 (patch) | |
| tree | 709ce26b7ace175eda4b8c0a57742d248e94f996 | |
| parent | 66a5e817f0cbba9c66b4be220f19914589a2b348 (diff) | |
| download | drakx-8ffb546708149e582a2fb92efbff948de88ed800.tar drakx-8ffb546708149e582a2fb92efbff948de88ed800.tar.gz drakx-8ffb546708149e582a2fb92efbff948de88ed800.tar.bz2 drakx-8ffb546708149e582a2fb92efbff948de88ed800.tar.xz drakx-8ffb546708149e582a2fb92efbff948de88ed800.zip | |
allow btrfs for / without separate /boot with grub2 (mga#15374)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index dd331c57d..7cfc637c5 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- bootloader: + o allow btrfs for / without separate /boot with grub2 (mga#15374) - partitioning wizard: o do not offer to select RAID as it result in a crash (mga#5800) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index afd4d78ec..914217add 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -2055,7 +2055,7 @@ sub install { if (my $part = fs::get::device2part($bootloader->{boot}, [ fs::get::fstab($all_hds) ])) { die N("You cannot install the bootloader on a %s partition\n", $part->{fs_type}) - if member($part->{fs_type}, qw(btrfs xfs)); + if member($part->{fs_type}, qw(xfs)); } $bootloader->{keytable} = keytable($bootloader->{keytable}); action($bootloader, 'install', $all_hds); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 28019289f..2a18978c6 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,7 @@ - bootloader: o add 'noiswmd' to kernel command line to manage isw_ bios fakeraids with dmraid for now (instead of mdadm) + o allow btrfs for / without separate /boot with grub2 (mga#15374) - partitioning wizard: o do not offer to select RAID as it result in a crash (mga#5800) |