WIP

agama-project · Sep 27, 2024 · ea47bd4 · ea47bd4
1 parent a80273d
commit ea47bd4
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 34 deletions.
diff --git a/...ma-lib/share/examples/storage_drives.json → ...ma-lib/share/examples/storage/drives.json b/...ma-lib/share/examples/storage_drives.json → ...ma-lib/share/examples/storage/drives.json
diff --git a/...are/examples/storage_default_volumes.json → .../share/examples/storage/generate_lvs.json b/...are/examples/storage_default_volumes.json → .../share/examples/storage/generate_lvs.json
@@ -15,8 +15,9 @@
       {
         "name": "system",
         "physicalVolumes": ["pv1"],
-        "extentSize": "8 MiB",
-        "logicalVolumes": ["default"]
+        "logicalVolumes": [
+          { "generate": "default" }
+        ]
       }
     ]
   }

diff --git a/...e/examples/storage_mandatory_volumes.json → ...amples/storage/generate_lvs_extended.json b/...e/examples/storage_mandatory_volumes.json → ...amples/storage/generate_lvs_extended.json
@@ -3,7 +3,6 @@
     "drives": [
       {
         "partitions": [
-          "mandatory",
           {
             "alias": "pv1",
             "id": "lvm",
@@ -14,16 +13,26 @@
     ],
     "volumeGroups": [
       {
-        "name": "data",
+        "name": "system",
         "physicalVolumes": ["pv1"],
-        "extentSize": "8 MiB",
         "logicalVolumes": [
           {
-            "name": "photos",
-            "size": {
-              "min": "10 GiB"
-            },
+            "generate": {
+              "logicalVolumes": "mandatory",
+              "encryption": {
+                "luks2": {
+                  "password": "12345"
+                }
+              },
+              "stripes": 10,
+              "stripeSize": "4 KiB"
+            }
+          },
+          {
+            "name": "data",
+            "size": "5 GiB",
             "filesystem": {
+              "path": "/data",
               "type": "xfs"
             }
           }

diff --git a/rust/agama-lib/share/examples/storage/generate_partitions.json b/rust/agama-lib/share/examples/storage/generate_partitions.json
@@ -0,0 +1,13 @@
+{
+  "storage": {
+    "drives": [
+      {
+        "partitions": [
+          {
+            "generate": "mandatory"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/rust/agama-lib/share/examples/storage/generate_partitions_extended.json b/rust/agama-lib/share/examples/storage/generate_partitions_extended.json
@@ -0,0 +1,26 @@
+{
+  "storage": {
+    "drives": [
+      {
+        "partitions": [
+          {
+            "size": "10 GiB",
+            "filesystem": {
+              "type": "vfat"
+            }
+          },
+          {
+            "generate": {
+              "partitions": "default",
+              "encryption": {
+                "luks2": {
+                  "password": "12345"
+                }
+              }
+            }
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/...ma-lib/share/examples/storage_guided.json → ...ma-lib/share/examples/storage/guided.json b/...ma-lib/share/examples/storage_guided.json → ...ma-lib/share/examples/storage/guided.json
diff --git a/...agama-lib/share/examples/storage_lvm.json → ...agama-lib/share/examples/storage/lvm.json b/...agama-lib/share/examples/storage_lvm.json → ...agama-lib/share/examples/storage/lvm.json
diff --git a/...ama-lib/share/examples/storage_sizes.json → ...ama-lib/share/examples/storage/sizes.json b/...ama-lib/share/examples/storage_sizes.json → ...ama-lib/share/examples/storage/sizes.json
diff --git a/rust/agama-lib/share/profile.schema.json b/rust/agama-lib/share/profile.schema.json
@@ -541,10 +541,35 @@
                 "items": {
                   "anyOf": [
                     {
-                      "$ref": "#/$defs/defaultVolumes"
+                      "$ref": "#/$defs/generateVolumes"
                     },
                     {
-                      "$ref": "#/$defs/mandatoryVolumes"
+                      "title": "Generate logical volumes",
+                      "description": "Creates the default or mandatory logical volumes configured by the selected product, allowing to customize some properties.",
+                      "type": "object",
+                      "additionalProperties": false,
+                      "required": ["generate"],
+                      "properties": {
+                        "generate": {
+                          "type": "object",
+                          "additionalProperties": false,
+                          "required": ["logicalVolumes"],
+                          "properties": {
+                            "logicalVolumes": {
+                              "enum": ["default", "mandatory"]
+                            },
+                            "encryption": {
+                              "$ref": "#/$defs/encryption"
+                            },
+                            "stripes": {
+                              "$ref": "#/$defs/lvStripes"
+                            },
+                            "stripeSize": {
+                              "$ref": "#/$defs/lvStripeSize"
+                            }
+                          }
+                        }
+                      }
                     },
                     {
                       "title": "Logical volume",
@@ -561,14 +586,10 @@
                           "$ref": "#/$defs/size"
                         },
                         "stripes": {
-                          "title": "Number of stripes",
-                          "type": "integer",
-                          "minimum": 1,
-                          "maximum": 128
+                          "$ref": "#/$defs/lvStripes"
                         },
                         "stripeSize": {
-                          "title": "Stripe size",
-                          "$ref": "#/$defs/sizeValue"
+                          "$ref": "#/$defs/lvStripeSize"
                         },
                         "encryption": {
                           "$ref": "#/$defs/encryption"
@@ -600,14 +621,10 @@
                           "$ref": "#/$defs/size"
                         },
                         "stripes": {
-                          "title": "Number of stripes",
-                          "type": "integer",
-                          "minimum": 1,
-                          "maximum": 128
+                          "$ref": "#/$defs/lvStripes"
                         },
                         "stripeSize": {
-                          "title": "Stripe size",
-                          "$ref": "#/$defs/sizeValue"
+                          "$ref": "#/$defs/lvStripeSize"
                         },
                         "encryption": {
                           "$ref": "#/$defs/encryption"
@@ -1212,26 +1229,47 @@
         }
       }
     },
-    "defaultVolumes": {
-      "title": "Default volumes",
-      "description": "Creates the default volumes configured by the selected product.",
-      "const": "default"
-    },
-    "mandatoryVolumes": {
-      "title": "Mandatory volumes",
-      "description": "Creates the mandatory volumes configured by the selected product.",
-      "const": "mandatory"
+    "generateVolumes": {
+      "title": "Generate volumes automatically",
+      "description": "Creates the default or mandatory volumes configured by the selected product.",
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["generate"],
+      "properties": {
+        "generate": {
+          "enum": ["default", "mandatory"]
+        }
+      }
     },
     "partitions": {
       "title": "Partitions",
       "type": "array",
       "items": {
         "anyOf": [
           {
-            "$ref": "#/$defs/defaultVolumes"
+            "$ref": "#/$defs/generateVolumes"
           },
           {
-            "$ref": "#/$defs/mandatoryVolumes"
+            "title": "Generate partitions",
+            "description": "Creates the default or mandatory partitions configured by the selected product, allowing to customize some properties.",
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["generate"],
+            "properties": {
+              "generate": {
+                "type": "object",
+                "additionalProperties": false,
+                "required": ["partitions"],
+                "properties": {
+                  "partitions": {
+                    "enum": ["default", "mandatory"]
+                  },
+                  "encryption": {
+                    "$ref": "#/$defs/encryption"
+                  }
+                }
+              }
+            }
           },
           {
             "title": "Partition to create or reuse",
@@ -1301,6 +1339,16 @@
           }
         ]
       }
+    },
+    "lvStripes": {
+      "title": "Number of stripes",
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 128
+    },
+    "lvStripeSize": {
+      "title": "Stripe size",
+      "$ref": "#/$defs/sizeValue"
     }
   }
 }