From 34581c1dca08ea8b254870219f41efab26a387d3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Sun, 11 Mar 2012 00:39:19 +0000
Subject: (Resize,dmcrypt_open,RemoveFromDm) fix error on removing LVs

eg: "Undefined subroutine &fs::dmcrypt::close_part called"
---
 perl-install/diskdrake/interactive.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/diskdrake')

diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 777184069..46288d717 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -860,6 +860,7 @@ sub Resize {
 	    partition_table::adjust_main_extended($hd);
 	    write_partitions($in, $hd) or return if $write_partitions && %nice_resize;
 	    if ($write_partitions && isLUKS($part)) {
+		require fs::dmcrypt;
 		fs::dmcrypt::open_part([], $low_part);
 	    }
 	}
@@ -951,7 +952,7 @@ sub dmcrypt_open {
 	       hidden => 1, focus => sub { 1 } } ]) or return;
     }
 
-    eval { fs::dmcrypt::open_part($all_hds->{dmcrypts}, $part) };
+    eval { require fs::dmcrypt; fs::dmcrypt::open_part($all_hds->{dmcrypts}, $part) };
     if ($@) {
 	delete $part->{dmcrypt_key};
 	die(($? >> 8) == 255 ? N("Invalid key") : $@);
@@ -1021,6 +1022,7 @@ sub RemoveFromRAID {
 }
 sub RemoveFromDm {
     my ($_in, $_hd, $part, $all_hds) = @_;
+    require fs::dmcrypt;
     fs::dmcrypt::close_part($all_hds->{dmcrypts}, $part);
 }
 sub RemoveFromLVM {
-- 
cgit v1.2.1