diff --git a/rust/agama-lib/share/examples/storage.json b/rust/agama-lib/share/examples/storage.json index 573aed64d2..e71e5ba445 100644 --- a/rust/agama-lib/share/examples/storage.json +++ b/rust/agama-lib/share/examples/storage.json @@ -1,63 +1,71 @@ { "storage": { - "guided": { - "target": { - "disk": "/dev/vdc" - }, - "boot": { - "configure": true, - "device": "/dev/vda" - }, - "encryption": { - "password": "notsecret", - "method": "luks2", - "pbkdFunction": "argon2i" - }, - "space": { - "policy": "custom", - "actions": [ - { "resize": "/dev/vda" }, - { "forceDelete": "/dev/vdb1" } - ] - }, - "volumes": [ - { - "mount": { - "path": "/", - "options": ["ro"] - }, - "filesystem": { - "btrfs": { - "snapshots": true - } - }, - "size": [1024, "5 Gib"], - "target": "default" + "boot": { + "configure": true, + "device": "/dev/vda" + }, + "drives": [ + { + "search": { + "name": "/dev/vda" }, - { - "mount": { - "path": "/home" + "ptableType": "gpt", + "partitions": [ + { + "search": { "name": "/dev/vda2" }, + "format": { + "filesystem": { + "btrfs": { + "snapshots": true + } + } + }, + "mount": { + "path": "/", + "options": ["ro"] + } }, - "filesystem": "xfs", - "size": { - "min": "5 GiB", - "max": "20 GiB" + { + "encrypt": { + "password": "notsecret", + "method": "luks2" + }, + "format": { + "filesystem": "xfs" + }, + "mount": { + "path": "/home" + } }, - "target": { - "newVg": "/dev/vda" + { + "encrypt": { + "password": "notsecret", + "method": "luks2" + }, + "format": { + "filesystem": "swap" + }, + "mount": { + "path": "swap" + } } + ] + }, + { + "search": { + "name": "/dev/vdb" }, - { - "mount": { - "path": "swap" - }, - "filesystem": "swap", - "size": "8 GiB", - "target": { - "newPartition": "/dev/vda" - } + "encrypt": { + "password": "notsecret", + "method": "luks2" + }, + "format": { + "filesystem": "ext4" + }, + "mount": { + "path": "/var/log" } - ] - } + } + ] } -} +} \ No newline at end of file diff --git a/rust/agama-lib/share/profile.schema.json b/rust/agama-lib/share/profile.schema.json index 3d2b2d8566..f639da2146 100644 --- a/rust/agama-lib/share/profile.schema.json +++ b/rust/agama-lib/share/profile.schema.json @@ -533,8 +533,11 @@ }, "legacyAutoyastStorage": { "title": "Legacy AutoYaST storage settings", - "description": "Accepts all options of the AutoYaST profile (XML to JSON)", - "type": "object" + "description": "Accepts all options of the AutoYaST partitioning section (XML to JSON)", + "type": "array", + "items": { + "type": "object" + } } }, "$defs": {