summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-04-27 12:32:49 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-04-27 12:32:49 +0000
commitc23f8b241ea5fd31a63f67e790486bf70338b8c9 (patch)
tree91aea9906a58064aeca6f1fcc9dfc558ae499152
parent2b0172189c1ce750bd25b50de8c79f955d460a09 (diff)
downloaddrakx-c23f8b241ea5fd31a63f67e790486bf70338b8c9.tar
drakx-c23f8b241ea5fd31a63f67e790486bf70338b8c9.tar.gz
drakx-c23f8b241ea5fd31a63f67e790486bf70338b8c9.tar.bz2
drakx-c23f8b241ea5fd31a63f67e790486bf70338b8c9.tar.xz
drakx-c23f8b241ea5fd31a63f67e790486bf70338b8c9.zip
fix display of non unlocked encrypted partitions
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 32968d885..ea8df631b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -7,6 +7,7 @@
o display lock icon on encrypted partitions
o fix loading of dmcrypt info now that /dev/mapper/* are symlinks
o fix creating encrypted LVM
+ o fix display of non unlocked encrypted partitions
Version 13.20 - 21 April 2010
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index bbe6f8a75..d2fe85f83 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -315,7 +315,7 @@ sub create_buttons4partitions {
};
foreach my $entry (@parts) {
- if(fs::type::isRawLUKS($entry)) {
+ if(fs::type::isRawLUKS($entry) && $entry->{dm_active}) {
my $p = find { $entry->{dm_name} eq $_->{dmcrypt_name} } @{$all_hds->{dmcrypts}};
$entry = $p if $p;
}