Merge pull request #466 from vojtechtrefny/main_encrypted-btrfs-fix

Set LUKS format before creating the LUKS device (#2332338)
storaged-project · Jan 12, 2025 · 2710af6 · 2710af6
2 parents e147ba0 + e8f791a
commit 2710af6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/blivetgui/blivet_utils.py b/blivetgui/blivet_utils.py
@@ -1029,6 +1029,7 @@ def _create_partition(self, user_input):
                                                  luks_sector_size=user_input.encryption_sector_size,
                                                  device=new_part.path)
             actions.append(blivet.deviceaction.ActionCreateFormat(new_part, part_fmt))
+            new_part.format = part_fmt
 
             luks_dev = LUKSDevice("luks-%s" % new_part.name, size=new_part.size, parents=[new_part])
             actions.append(blivet.deviceaction.ActionCreateDevice(luks_dev))
@@ -1084,6 +1085,7 @@ def _create_lvmlv(self, user_input):
                                                      luks_sector_size=user_input.encryption_sector_size,
                                                      device=new_lv.path)
                 actions.append(blivet.deviceaction.ActionCreateFormat(new_lv, luks_fmt))
+                new_lv.format = luks_fmt
 
                 luks_dev = LUKSDevice("luks-%s" % new_lv.name, size=new_lv.size, parents=[new_lv])
                 actions.append(blivet.deviceaction.ActionCreateDevice(luks_dev))