summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-06-03 11:50:24 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-06-03 11:50:24 +0000
commit525f353e86a72d4fa11ecb2a9c0d99f387a623c4 (patch)
treeecc599fcd97d3f989fdf9def55b4317e83798890 /perl-install/diskdrake
parent8658cf3deb673be544fae0be80f88dcddb49061c (diff)
downloaddrakx-backup-do-not-use-525f353e86a72d4fa11ecb2a9c0d99f387a623c4.tar
drakx-backup-do-not-use-525f353e86a72d4fa11ecb2a9c0d99f387a623c4.tar.gz
drakx-backup-do-not-use-525f353e86a72d4fa11ecb2a9c0d99f387a623c4.tar.bz2
drakx-backup-do-not-use-525f353e86a72d4fa11ecb2a9c0d99f387a623c4.tar.xz
drakx-backup-do-not-use-525f353e86a72d4fa11ecb2a9c0d99f387a623c4.zip
Disable dmcrypt before deleting partition, evin if inside lvm/raid
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r--perl-install/diskdrake/interactive.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 6d22bd43c..3ecdcb317 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -586,6 +586,11 @@ First remove a primary partition and create an extended partition."));
sub Delete {
my ($in, $hd, $part, $all_hds) = @_;
+ 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;
+ }
if (isRAID($part)) {
raid::delete($all_hds->{raids}, $part);
} elsif (isLVM($hd)) {
@@ -603,11 +608,6 @@ sub Delete {
if (arch() =~ /ppc/) {
undef $partition_table::mac::bootstrap_part if isAppleBootstrap($part) && ($part->{device} = $partition_table::mac::bootstrap_part);
}
- 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;
- }
partition_table::remove($hd, $part);
warn_if_renumbered($in, $hd);
}