summaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-25 18:30:22 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-25 18:30:22 +0000
commit96f26e556fa2b3a0f4943ee385f3aacc9aa4cd12 (patch)
tree8be38809ec61f75f4226c9c70f9a999d1c845884 /rescue
parenteaaaab5e2e02b4e67e125b41175801e2d738b98d (diff)
downloaddrakx-backup-do-not-use-96f26e556fa2b3a0f4943ee385f3aacc9aa4cd12.tar
drakx-backup-do-not-use-96f26e556fa2b3a0f4943ee385f3aacc9aa4cd12.tar.gz
drakx-backup-do-not-use-96f26e556fa2b3a0f4943ee385f3aacc9aa4cd12.tar.bz2
drakx-backup-do-not-use-96f26e556fa2b3a0f4943ee385f3aacc9aa4cd12.tar.xz
drakx-backup-do-not-use-96f26e556fa2b3a0f4943ee385f3aacc9aa4cd12.zip
fix mounting / on soft RAID or crypted LV (mga#3778 & mga#448)
Diffstat (limited to 'rescue')
-rw-r--r--rescue/NEWS1
-rwxr-xr-xrescue/guessmounts2
2 files changed, 3 insertions, 0 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index dfee93ba4..d47ea49e0 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,5 +1,6 @@
- enable rescue through serial line (mga#2052)
- fix mounting / on LV
+- fix mounting / on soft RAID or crypted LV (mga#3778 & mga#448)
- include xz for xz modules
- switch to udev
diff --git a/rescue/guessmounts b/rescue/guessmounts
index 8fa92d427..48d24dbab 100755
--- a/rescue/guessmounts
+++ b/rescue/guessmounts
@@ -16,6 +16,7 @@ use lib qw(/usr/lib/libDrakX);
use common;
use devices;
use fs;
+use fs::dmcrypt;
use fs::proc_partitions;
use fs::type;
use lvm;
@@ -38,6 +39,7 @@ mkdir_p($target);
devices::init_device_mapper();
lvm::detect_during_install();
+fs::dmcrypt::init;
my @parts = map {
$_->{device} = delete $_->{dev};