summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-03-03 14:47:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-03-03 14:47:30 +0000
commit87f1d2a844a542c82449019b13584d38884cb9a1 (patch)
tree7b50e0a6b1f8c1d466958242e082b2bdabb040ca /perl-install
parent931c0095861d417b02c4e7a4f2c6f6e9ba342bac (diff)
downloaddrakx-87f1d2a844a542c82449019b13584d38884cb9a1.tar
drakx-87f1d2a844a542c82449019b13584d38884cb9a1.tar.gz
drakx-87f1d2a844a542c82449019b13584d38884cb9a1.tar.bz2
drakx-87f1d2a844a542c82449019b13584d38884cb9a1.tar.xz
drakx-87f1d2a844a542c82449019b13584d38884cb9a1.zip
move set_loop() from formatMount_part to real_format_part to fix Format with encrypted files/devices
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index f21e68dae..4bf68b93c 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -609,6 +609,10 @@ sub real_format_part {
$part->{isFormatted} and return;
+ if ($part->{encrypt_key}) {
+ set_loop($part);
+ }
+
my $dev = $part->{real_device} || $part->{device};
my @options = if_($part->{toFormatCheck}, "-c");
@@ -675,9 +679,6 @@ sub formatMount_part {
if (my $p = up_mount_point($part->{mntpoint}, $fstab)) {
formatMount_part($p, $raids, $fstab, $prefix, $wait_message) unless loopback::carryRootLoopback($part);
}
- if ($part->{encrypt_key}) {
- set_loop($part);
- }
if ($part->{toFormat}) {
format_part($raids, $part, $prefix, $wait_message);
}