summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2014-08-27 21:11:05 +0000
committerPascal Terjan <pterjan@gmail.com>2014-10-20 21:29:55 +0000
commit9c28f1e61a447052bdccb3364174745ac7cafa29 (patch)
treefaa24a5830f19990cd2e83adf7783fbe8ca756c2
parent84066dbe06d81129709ac743a739cc59aaea12f7 (diff)
downloaddrakx-9c28f1e61a447052bdccb3364174745ac7cafa29.tar
drakx-9c28f1e61a447052bdccb3364174745ac7cafa29.tar.gz
drakx-9c28f1e61a447052bdccb3364174745ac7cafa29.tar.bz2
drakx-9c28f1e61a447052bdccb3364174745ac7cafa29.tar.xz
drakx-9c28f1e61a447052bdccb3364174745ac7cafa29.zip
Allow /boot on btrfs
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/install/NEWS2
4 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index f6ada1ad3..fd93f33c3 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- allow /boot on btrfs
+
Version 16.39 - 17 August 2014
- mygtk3:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 4d0005cd7..885c30dfa 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))
- && !(/grub/ && isRAID($boot_part))
+ !(/lilo/ && (isLoopback($root_part) || $have_dmraid ||
+ $boot_part->{fs_type} eq 'btrfs'))
&& !(/grub-graphic/ && cat_("/proc/cmdline") =~ /console=ttyS/);
} method_choices_raw($b_prefix_mounted);
}
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 8f5d600b6..47cb1c051 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -479,8 +479,6 @@ You should create a separate /boot partition first") if $mntpoint eq "/" && isLV
die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
if !isTrueLocalFS($part) && $mntpoint eq '/';
die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
- if $part->{fs_type} eq 'btrfs' && $mntpoint eq '/boot';
- die N("You need a true filesystem (ext2/3/4, reiserfs, xfs, or jfs) for this mount point\n")
if !isTrueFS($part) && member($mntpoint, '/home', fs::type::directories_needed_to_boot());
die N("You cannot use an encrypted filesystem for mount point %s", $mntpoint)
if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot));
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 8329fe9a2..201dc7067 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- allow /boot on btrfs
+
Version 16.40 - 22 August 2014
- adwaita-gtk3-theme no longer provides a settings.ini file