schema: declarative version

- Adapt to new agreed format.
joseivanlopez · Jul 25, 2024 · 9154144 · 9154144
1 parent 24769bb
commit 9154144
Show file tree

Hide file tree

Showing 2 changed files with 274 additions and 226 deletions.
diff --git a/rust/agama-lib/share/examples/storage.json b/rust/agama-lib/share/examples/storage.json
@@ -13,46 +13,36 @@
         "partitions": [
           {
             "search": { "name": "/dev/vda2" },
-            "format": {
-              "filesystem": {
-                "btrfs": {
-                  "snapshots": true
-                }
-              }
-            },
-            "mount": {
+            "filesystem": {
+              "reuse": false,
+              "type": "btrfs",
+              "btrfsOptions": {
+                "snapshots": true
+              },
               "path": "/",
-              "options": ["ro"]
+              "mountOptions": ["ro"]
             }
           },
           {
-            "create": {
-              "id": "linux",
-              "size": "10 GiB"
-            },
-            "encrypt": {
-              "password": "notsecret",
+            "id": "linux",
+            "size": "10 GiB",
+            "encryption": {
+              "key": "notsecret",
               "method": "luks2"
             },
-            "format": {
-              "filesystem": "xfs"
-            },
-            "mount": {
+            "filesystem": {
+              "type": "xfs",
               "path": "/home"
             }
           },
           {
-            "create": {
-              "size": "2 GiB"
-            },
-            "encrypt": {
-              "password": "notsecret",
+            "size": "2 GiB",
+            "encryption": {
+              "key": "notsecret",
               "method": "luks2"
             },
-            "format": {
-              "filesystem": "swap"
-            },
-            "mount": {
+            "filesystem": {
+              "type": "swap",
               "path": "swap"
             }
           }
@@ -62,14 +52,12 @@
         "search": {
           "name": "/dev/vdb"
         },
-        "encrypt": {
-          "password": "notsecret",
+        "encryption": {
+          "key": "notsecret",
           "method": "luks2"
         },
-        "format": {
-          "filesystem": "ext4"
-        },
-        "mount": {
+        "filesystem": {
+          "type": "ext4",
           "path": "/var/log"
         }
       }