From ab5751caddec8551008b80000ca23c892f6a1f16 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Thu, 22 Apr 2010 13:36:28 +0000
Subject: handle deleting encrypted partitions

---
 perl-install/NEWS                     | 1 +
 perl-install/diskdrake/interactive.pm | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index ef7b9815e..421c5ab03 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
 - diskdrake:
   o do not warn about data loss when changing type of unformatted partition
   o do not write partition table after creation if not needed
+  o handle deleting encrypted partitions
 
 Version 13.20 - 21 April 2010
 
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index fb83cb6f9..e3bdb402c 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -598,6 +598,11 @@ 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}) {
+	    my $p = find { $_->{dm_name} eq $part->{dmcrypt_name} } partition_table::get_normal_parts($hd);
+	    RemoveFromDm($in, $hd, $p, $all_hds);
+	    $part = $p;
+	}
 	partition_table::remove($hd, $part);
 	warn_if_renumbered($in, $hd);
     }
-- 
cgit v1.2.1