lvm-luks-format fixes

Vanilla-OS · Nov 4, 2023 · d580010 · d580010
1 parent 2311365
commit d580010
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/recipe.go b/core/recipe.go
@@ -566,13 +566,17 @@ func runSetupOperation(diskLabel, operation string, args []interface{}) error {
 		for uuid == "" {
 			uuid, _ = dummyPart.GetUUID()
 		}
-		err = MakeFs(&dummyPart)
+		err = LuksOpen(&dummyPart, fmt.Sprintf("luks-%s", uuid), password)
+		if err != nil {
+			return fmt.Errorf("failed to execute operation %s: %s", operation, err)
+		}
+		err = LUKSMakeFs(&dummyPart)
 		if err != nil {
 			return fmt.Errorf("failed to execute operation %s: %s", operation, err)
 		}
 		if len(args) == 4 {
 			label := args[3].(string)
-			err := dummyPart.SetLabel(label)
+			err := LUKSSetLabel(&dummyPart, label)
 			if err != nil {
 				return fmt.Errorf("failed to execute operation %s: %s", operation, err)
 			}