summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-04-22 13:36:28 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-04-22 13:36:28 +0000
commitab5751caddec8551008b80000ca23c892f6a1f16 (patch)
tree63179755eb46f9ffc71b5b857852c4f9bb2788b0
parente78ce30b4cf0fafa1cbe742e25d92690e558fdf0 (diff)
downloaddrakx-ab5751caddec8551008b80000ca23c892f6a1f16.tar
drakx-ab5751caddec8551008b80000ca23c892f6a1f16.tar.gz
drakx-ab5751caddec8551008b80000ca23c892f6a1f16.tar.bz2
drakx-ab5751caddec8551008b80000ca23c892f6a1f16.tar.xz
drakx-ab5751caddec8551008b80000ca23c892f6a1f16.zip
handle deleting encrypted partitions
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/diskdrake/interactive.pm5
2 files changed, 6 insertions, 0 deletions
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);
}