summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake/interactive.pm
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-04-29 13:33:17 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-04-29 13:33:17 +0000
commit8967af08327daac4cdca221971fd790961039cbe (patch)
treed34b7786399cde5144126b51789af4a96b441e91 /perl-install/diskdrake/interactive.pm
parentfe7f2ec10a2c352db4c457df549326cee511b06b (diff)
downloaddrakx-8967af08327daac4cdca221971fd790961039cbe.tar
drakx-8967af08327daac4cdca221971fd790961039cbe.tar.gz
drakx-8967af08327daac4cdca221971fd790961039cbe.tar.bz2
drakx-8967af08327daac4cdca221971fd790961039cbe.tar.xz
drakx-8967af08327daac4cdca221971fd790961039cbe.zip
refuse to have /boot encrypted
Diffstat (limited to 'perl-install/diskdrake/interactive.pm')
-rw-r--r--perl-install/diskdrake/interactive.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 34709b826..51c25703c 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -601,7 +601,7 @@ sub Delete {
if (arch() =~ /ppc/) {
undef $partition_table::mac::bootstrap_part if isAppleBootstrap($part) && ($part->{device} = $partition_table::mac::bootstrap_part);
}
- if ($part->{dmcrypt_name}) {
+ if (fs::type::isLUKS($part)) {
my $p = find { $_->{dm_name} eq $part->{dmcrypt_name} } partition_table::get_normal_parts($hd);
RemoveFromDm($in, $hd, $p, $all_hds);
$part = $p;
@@ -1375,7 +1375,7 @@ sub format_part_info {
$info .= N("Not formatted\n") if !$part->{isFormatted} && $part->{notFormatted};
$info .= N("Mounted\n") if $part->{isMounted};
$info .= N("RAID %s\n", $part->{raid}) if isPartOfRAID($part);
- if (fs::type::isRawLUKS($part) || $part->{dmcrypt_name}) {
+ if (fs::type::isRawLUKS($part) || fs::type::isLUKS($part)) {
$info .= N("Encrypted")."\n";
if (fs::type::isRawLUKS($part)) {
$info .= ($part->{dm_active} && $part->{dm_name} ? N(" (mapped on %s)", $part->{dm_name}) :