move set_loop() from formatMount_part to real_format_part to fix Format with encrypted files/devices

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);
     }