summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-01-13 06:36:23 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-01-13 06:36:23 +0100
commit29d9934ca3d8493b249efc6b883590fdbc08408a (patch)
treedaa913667027b9726c3bbf0baafc0d3dd5decb79
parent9190569ed9dd9ffa7d645c8af0c12a6267838eac (diff)
downloaddrakx-29d9934ca3d8493b249efc6b883590fdbc08408a.tar
drakx-29d9934ca3d8493b249efc6b883590fdbc08408a.tar.gz
drakx-29d9934ca3d8493b249efc6b883590fdbc08408a.tar.bz2
drakx-29d9934ca3d8493b249efc6b883590fdbc08408a.tar.xz
drakx-29d9934ca3d8493b249efc6b883590fdbc08408a.zip
do not propose check bad blocks for btrfs (Manuel Hiebel, mga#10116)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/partitioning.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 6 insertions, 1 deletions
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