summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-11 00:39:19 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-11 00:39:19 +0000
commit6ae2a5912a7d8d0f5b9f3dbd6799eb25ea3492d3 (patch)
treef72537c58249cb74e83a2a8c0b037650c1978e24 /perl-install
parentdec9b1165c1ab64f03dd51c683aa839e3ed17c86 (diff)
downloaddrakx-6ae2a5912a7d8d0f5b9f3dbd6799eb25ea3492d3.tar
drakx-6ae2a5912a7d8d0f5b9f3dbd6799eb25ea3492d3.tar.gz
drakx-6ae2a5912a7d8d0f5b9f3dbd6799eb25ea3492d3.tar.bz2
drakx-6ae2a5912a7d8d0f5b9f3dbd6799eb25ea3492d3.tar.xz
drakx-6ae2a5912a7d8d0f5b9f3dbd6799eb25ea3492d3.zip
(Resize,dmcrypt_open,RemoveFromDm) fix error on removing LVs
eg: "Undefined subroutine &fs::dmcrypt::close_part called"
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/interactive.pm4
-rw-r--r--perl-install/install/NEWS2
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6e0a2c9b6..bf5215ca5 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,6 @@
- english message improvement (mga#456)
+- diskdrake:
+ o fix error on removing LVs
Version 13.89.1 - 02 March 2012
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 {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b25e0972f..066c21635 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,8 @@
- explain why acpi, acpid & mageia-gfxboot-theme packages are selected
- install more packages earlier (shorewall & mandi), preventing useless
installing steps later at summary stage
+- partitionning:
+ o fix error on removing LVs
Version 13.91.1 - 08 March 2012