summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-23 15:30:45 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-23 15:30:45 +0000
commit3980ebfd98fe7be5cce63bdfba0c567a052d996a (patch)
treead9d6572c345be401976207249f5cd75d6a1df7d
parentac60b247f3e856c5b275d8f31e76a7c578a9f42e (diff)
downloaddrakx-3980ebfd98fe7be5cce63bdfba0c567a052d996a.tar
drakx-3980ebfd98fe7be5cce63bdfba0c567a052d996a.tar.gz
drakx-3980ebfd98fe7be5cce63bdfba0c567a052d996a.tar.bz2
drakx-3980ebfd98fe7be5cce63bdfba0c567a052d996a.tar.xz
drakx-3980ebfd98fe7be5cce63bdfba0c567a052d996a.zip
fix a crash when trying to create a encrypted LVM partition (mga#9837)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/diskdrake/interactive.pm1
-rw-r--r--perl-install/install/NEWS3
3 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 95ba3e7e3..fd26a6c4a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- partionning:
+ o fix a crash when trying to create a encrypted LVM partition (mga#9837)
+
Version 15.42 - 21 April 2013
- partionning (mga#5661):
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 7e1452116..02ab8bdb1 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -966,6 +966,7 @@ sub detect_lvms_on_dmcrypt {
$all_hds->{lvms} = [ fsedit::lvms($all_hds) ];
fs::dmcrypt::read_crypttab_($all_hds, $tmp_file);
rm_rf($tmp_file);
+ require lvm;
lvm::detect_during_install() if $::isInstall;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 82afa967f..7e6d18235 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- partionning:
+ o fix a crash when trying to create a encrypted LVM partition (mga#9837)
+
Version 15.43 - 22 april 2013
- prepare final release: left background