From 151b6e48ae9bdc4e826a69091ff0aed89f842f11 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 30 Jan 2024 13:39:46 -0500 Subject: [PATCH] stages(sgdisk): support label option We only support `gpt` here so it would seem this option doesn't make much sense to add, but it will make it so that the mpp-define-images from osbuild-mpp can be passed in to `org.osbuild.sgdisk` just as it can be passed in today to `org.osbuild.sfdisk`. --- stages/org.osbuild.sgdisk | 5 +++++ test/data/manifests/fedora-ostree-image.json | 2 +- test/data/manifests/fedora-ostree-image.mpp.yaml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stages/org.osbuild.sgdisk b/stages/org.osbuild.sgdisk index 1627a90f..f85a762a 100755 --- a/stages/org.osbuild.sgdisk +++ b/stages/org.osbuild.sgdisk @@ -35,6 +35,11 @@ SCHEMA_2 = r""" "type": "boolean", "default": true }, + "label": { + "description": "The type of the partition table. Only 'gpt' supported.", + "type": "string", + "enum": ["gpt"] + }, "partitions": { "description": "Partition layout ", "type": "array", diff --git a/test/data/manifests/fedora-ostree-image.json b/test/data/manifests/fedora-ostree-image.json index df769a7a..917d4ce6 100644 --- a/test/data/manifests/fedora-ostree-image.json +++ b/test/data/manifests/fedora-ostree-image.json @@ -1216,7 +1216,7 @@ } }, { - "type": "org.osbuild.sfdisk", + "type": "org.osbuild.sgdisk", "devices": { "device": { "type": "org.osbuild.loopback", diff --git a/test/data/manifests/fedora-ostree-image.mpp.yaml b/test/data/manifests/fedora-ostree-image.mpp.yaml index f93e8a0e..ce0235e8 100644 --- a/test/data/manifests/fedora-ostree-image.mpp.yaml +++ b/test/data/manifests/fedora-ostree-image.mpp.yaml @@ -143,7 +143,7 @@ pipelines: filename: disk.img size: mpp-format-string: '{image.size}' - - type: org.osbuild.sfdisk + - type: org.osbuild.sgdisk devices: device: type: org.osbuild.loopback