From 29d9934ca3d8493b249efc6b883590fdbc08408a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 13 Jan 2014 06:36:23 +0100
Subject: do not propose check bad blocks for btrfs (Manuel Hiebel, mga#10116)

---
 perl-install/NEWS               | 2 ++
 perl-install/fs/partitioning.pm | 2 +-
 perl-install/install/NEWS       | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4a8515049..d07366094 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake:
+  o do not propose check bad blocks for btrfs (Manuel Hiebel, mga#10116)
 - drakboot:
   o add minimal/experimental lightdm autologin support (mga#11746)
 - harddrake, logdrake:
diff --git a/perl-install/fs/partitioning.pm b/perl-install/fs/partitioning.pm
index 015a7e4e8..cf85aaa33 100644
--- a/perl-install/fs/partitioning.pm
+++ b/perl-install/fs/partitioning.pm
@@ -52,7 +52,7 @@ sub choose_partitions_to_format {
 	    ({
 	      text => partition_table::description($e), type => 'bool',
 	      val => \$e->{toFormatTmp}
-	     }, if_(!isLoopback($_) && !member($_->{fs_type}, 'reiserfs', 'xfs', 'jfs'), {
+	     }, if_(!isLoopback($_) && !member($_->{fs_type}, qw(btrfs jfs reiserfs xfs)), {
 	      text => partition_table::description($e), type => 'bool', advanced => 1, 
 	      disabled => sub { !$e->{toFormatTmp} },
 	      val => \$e->{toFormatCheck}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 17805c15c..24d8fbd6f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- partitioning:
+  o do not propose check bad blocks for btrfs (Manuel Hiebel, mga#10116)
+
 Version 16.20 - 6 January 2014
 
 - Mageia 4 artwork
-- 
cgit v1.2.1