bd4ab1d36f
The `size` option was using `-l`, which in fact was `--extents`. Fix that to use `--size` and add a new option `extents` that will in fact call translate to `--extents` and this replace the current use of the `size` option. Adapt the `fedora-ostree-image` test manifest to use `extents`.
687 lines
20 KiB
JSON
687 lines
20 KiB
JSON
{
|
|
"version": "2",
|
|
"mpp-define-image": {
|
|
"id": "image",
|
|
"size": "10737418240",
|
|
"table": {
|
|
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
|
|
"label": "gpt",
|
|
"partitions": [
|
|
{
|
|
"id": "bios-boot",
|
|
"size": 2048,
|
|
"type": "21686148-6449-6E6F-744E-656564454649",
|
|
"bootable": true,
|
|
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
|
|
},
|
|
{
|
|
"id": "efi",
|
|
"size": 204800,
|
|
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
|
|
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
|
|
},
|
|
{
|
|
"id": "boot",
|
|
"size": 204800,
|
|
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
|
|
"uuid": "61B2905B-DF3E-4FB3-80FA-49D1E773AA32"
|
|
},
|
|
{
|
|
"id": "lvm",
|
|
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
|
|
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
|
|
}
|
|
]
|
|
}
|
|
},
|
|
"pipelines": [
|
|
{
|
|
"mpp-import-pipeline": {
|
|
"path": "f34-build-v2.json",
|
|
"id": "build"
|
|
},
|
|
"runner": "org.osbuild.fedora34"
|
|
},
|
|
{
|
|
"name": "ostree-tree",
|
|
"build": "name:build",
|
|
"stages": [
|
|
{
|
|
"type": "org.osbuild.rpm",
|
|
"options": {
|
|
"gpgkeys": [
|
|
"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy\nH4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL\nM+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI\nU35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A\n7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o\nitLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2\niXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v\nergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC\npZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih\nE6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg\nz6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB\ntDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq\n5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel\nvrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM\nNTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg\nwUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx\n7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj\nLevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA\nqY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU\neldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb\nAkz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe\noNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==\n=QWRO\n-----END PGP PUBLIC KEY BLOCK-----\n"
|
|
]
|
|
},
|
|
"inputs": {
|
|
"packages": {
|
|
"type": "org.osbuild.files",
|
|
"origin": "org.osbuild.source",
|
|
"mpp-depsolve": {
|
|
"architecture": "x86_64",
|
|
"module-platform-id": "f34",
|
|
"repos": [
|
|
{
|
|
"id": "default",
|
|
"baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/f34/f34-x86_64-fedora-20210512/"
|
|
}
|
|
],
|
|
"packages": [
|
|
"fedora-release-iot",
|
|
"glibc",
|
|
"glibc-minimal-langpack",
|
|
"nss-altfiles",
|
|
"sssd-client",
|
|
"libsss_sudo",
|
|
"shadow-utils",
|
|
"kernel",
|
|
"dracut-config-generic",
|
|
"dracut-network",
|
|
"rpm-ostree",
|
|
"polkit",
|
|
"lvm2",
|
|
"cryptsetup",
|
|
"pinentry",
|
|
"keyutils",
|
|
"cracklib-dicts",
|
|
"e2fsprogs",
|
|
"xfsprogs",
|
|
"dosfstools",
|
|
"gnupg2",
|
|
"basesystem",
|
|
"python3",
|
|
"bash",
|
|
"xz",
|
|
"gzip",
|
|
"coreutils",
|
|
"which",
|
|
"curl",
|
|
"firewalld",
|
|
"iptables",
|
|
"NetworkManager",
|
|
"NetworkManager-wifi",
|
|
"NetworkManager-wwan",
|
|
"wpa_supplicant",
|
|
"wireless-regdb",
|
|
"iwd",
|
|
"tpm2-pkcs11",
|
|
"dnsmasq",
|
|
"traceroute",
|
|
"hostname",
|
|
"iproute",
|
|
"iputils",
|
|
"openssh-clients",
|
|
"openssh-server",
|
|
"passwd",
|
|
"policycoreutils",
|
|
"procps-ng",
|
|
"rootfiles",
|
|
"rpm",
|
|
"selinux-policy-targeted",
|
|
"setup",
|
|
"shadow-utils",
|
|
"sudo",
|
|
"systemd",
|
|
"util-linux",
|
|
"vim-minimal",
|
|
"less",
|
|
"tar",
|
|
"greenboot",
|
|
"greenboot-grub2",
|
|
"greenboot-rpm-ostree-grub2",
|
|
"greenboot-reboot",
|
|
"greenboot-status",
|
|
"ignition",
|
|
"zram-generator",
|
|
"zram-generator-defaults",
|
|
"rsync",
|
|
"attr",
|
|
"ima-evm-utils",
|
|
"openssl",
|
|
"bash-completion",
|
|
"tmux",
|
|
"screen",
|
|
"policycoreutils-python-utils",
|
|
"setools-console",
|
|
"usbguard",
|
|
"audit",
|
|
"rng-tools",
|
|
"chrony",
|
|
"bluez",
|
|
"bluez-libs",
|
|
"bluez-mesh",
|
|
"kernel-tools",
|
|
"libgpiod-utils",
|
|
"podman",
|
|
"podman-plugins",
|
|
"container-selinux",
|
|
"skopeo",
|
|
"criu",
|
|
"slirp4netns",
|
|
"fuse-overlayfs",
|
|
"grub2",
|
|
"grub2-efi-x64",
|
|
"efibootmgr",
|
|
"shim-x64",
|
|
"microcode_ctl",
|
|
"cloud-init"
|
|
],
|
|
"excludes": [
|
|
"dracut-config-rescue"
|
|
]
|
|
}
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.locale",
|
|
"options": {
|
|
"language": "en_US.UTF-8"
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.systemd",
|
|
"options": {
|
|
"enabled_services": [
|
|
"NetworkManager.service",
|
|
"cloud-config",
|
|
"cloud-final",
|
|
"cloud-init",
|
|
"cloud-init-local",
|
|
"firewalld.service",
|
|
"rngd.service",
|
|
"sshd.service",
|
|
"greenboot-grub2-set-counter.service",
|
|
"greenboot-grub2-set-success.service",
|
|
"greenboot-healthcheck.service",
|
|
"greenboot-rpm-ostree-grub2-check-fallback.service",
|
|
"greenboot-status.service",
|
|
"greenboot-task-runner.service"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.selinux",
|
|
"options": {
|
|
"file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.ostree.preptree",
|
|
"options": {
|
|
"etc_group_members": [
|
|
"wheel",
|
|
"docker"
|
|
]
|
|
}
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "ostree-commit",
|
|
"build": "name:build",
|
|
"stages": [
|
|
{
|
|
"type": "org.osbuild.ostree.init",
|
|
"options": {
|
|
"path": "/repo"
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.ostree.commit",
|
|
"inputs": {
|
|
"tree": {
|
|
"type": "org.osbuild.tree",
|
|
"origin": "org.osbuild.pipeline",
|
|
"references": [
|
|
"name:ostree-tree"
|
|
]
|
|
}
|
|
},
|
|
"options": {
|
|
"ref": "fedora/x86_64/osbuild",
|
|
"os_version": "34"
|
|
}
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "image-tree",
|
|
"build": "name:build",
|
|
"stages": [
|
|
{
|
|
"type": "org.osbuild.ostree.init-fs"
|
|
},
|
|
{
|
|
"type": "org.osbuild.ostree.pull",
|
|
"options": {
|
|
"repo": "/ostree/repo",
|
|
"remote": "osbuild"
|
|
},
|
|
"inputs": {
|
|
"commits": {
|
|
"type": "org.osbuild.ostree",
|
|
"origin": "org.osbuild.pipeline",
|
|
"references": {
|
|
"name:ostree-commit": {
|
|
"ref": "fedora/x86_64/osbuild"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.ostree.os-init",
|
|
"options": {
|
|
"osname": "fedora"
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.ostree.config",
|
|
"options": {
|
|
"repo": "/ostree/repo",
|
|
"config": {
|
|
"sysroot": {
|
|
"readonly": true,
|
|
"bootloader": "none"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.mkdir",
|
|
"options": {
|
|
"paths": [
|
|
{
|
|
"path": "/boot/efi",
|
|
"mode": 448
|
|
}
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.ostree.deploy",
|
|
"options": {
|
|
"osname": "fedora",
|
|
"ref": "fedora/x86_64/osbuild",
|
|
"remote": "osbuild",
|
|
"mounts": [
|
|
"/boot",
|
|
"/boot/efi"
|
|
],
|
|
"rootfs": {
|
|
"label": "root"
|
|
},
|
|
"kernel_opts": [
|
|
"console=tty0",
|
|
"console=ttyS0",
|
|
"systemd.log_target=console",
|
|
"systemd.journald.forward_to_console=1"
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.ostree.fillvar",
|
|
"options": {
|
|
"deployment": {
|
|
"osname": "fedora",
|
|
"ref": "fedora/x86_64/osbuild"
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.fstab",
|
|
"mounts": [
|
|
{
|
|
"type": "org.osbuild.ostree.deployment",
|
|
"name": "ostree.deployment",
|
|
"options": {
|
|
"deployment": {
|
|
"osname": "fedora",
|
|
"ref": "fedora/x86_64/osbuild"
|
|
}
|
|
}
|
|
}
|
|
],
|
|
"options": {
|
|
"filesystems": [
|
|
{
|
|
"label": "boot",
|
|
"vfs_type": "ext4",
|
|
"path": "/boot",
|
|
"freq": 1,
|
|
"passno": 1
|
|
},
|
|
{
|
|
"label": "root",
|
|
"vfs_type": "xfs",
|
|
"path": "/",
|
|
"freq": 1,
|
|
"passno": 1
|
|
},
|
|
{
|
|
"label": "ESP",
|
|
"vfs_type": "vfat",
|
|
"path": "/boot/efi",
|
|
"options": "umask=0077,shortname=winnt",
|
|
"freq": 0,
|
|
"passno": 2
|
|
}
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.ostree.selinux",
|
|
"options": {
|
|
"deployment": {
|
|
"osname": "fedora",
|
|
"ref": "fedora/x86_64/osbuild"
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.grub2",
|
|
"options": {
|
|
"rootfs": {
|
|
"label": "root"
|
|
},
|
|
"bootfs": {
|
|
"label": "boot"
|
|
},
|
|
"uefi": {
|
|
"vendor": "fedora",
|
|
"install": true
|
|
},
|
|
"legacy": "i386-pc",
|
|
"write_defaults": false,
|
|
"greenboot": true
|
|
}
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "image",
|
|
"build": "name:build",
|
|
"stages": [
|
|
{
|
|
"type": "org.osbuild.truncate",
|
|
"options": {
|
|
"filename": "disk.img",
|
|
"size": {
|
|
"mpp-format-string": "{image.size}"
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.sfdisk",
|
|
"devices": {
|
|
"device": {
|
|
"type": "org.osbuild.loopback",
|
|
"options": {
|
|
"filename": "disk.img"
|
|
}
|
|
}
|
|
},
|
|
"options": {
|
|
"mpp-format-json": "{image.layout}"
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.mkfs.fat",
|
|
"devices": {
|
|
"device": {
|
|
"type": "org.osbuild.loopback",
|
|
"options": {
|
|
"filename": "disk.img",
|
|
"start": {
|
|
"mpp-format-int": "{image.layout['efi'].start}"
|
|
},
|
|
"size": {
|
|
"mpp-format-int": "{image.layout['efi'].size}"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"options": {
|
|
"label": "ESP",
|
|
"volid": "7B7795E7"
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.mkfs.ext4",
|
|
"devices": {
|
|
"device": {
|
|
"type": "org.osbuild.loopback",
|
|
"options": {
|
|
"filename": "disk.img",
|
|
"start": {
|
|
"mpp-format-int": "{image.layout['boot'].start}"
|
|
},
|
|
"size": {
|
|
"mpp-format-int": "{image.layout['boot'].size}"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"options": {
|
|
"uuid": "156f0420-627b-4151-ae6f-fda298097515",
|
|
"label": "boot"
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.lvm2.create",
|
|
"devices": {
|
|
"device": {
|
|
"type": "org.osbuild.loopback",
|
|
"options": {
|
|
"filename": "disk.img",
|
|
"start": {
|
|
"mpp-format-int": "{image.layout['lvm'].start}"
|
|
},
|
|
"size": {
|
|
"mpp-format-int": "{image.layout['lvm'].size}"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"options": {
|
|
"volumes": [
|
|
{
|
|
"name": "root",
|
|
"extents": "100%FREE"
|
|
}
|
|
]
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.mkfs.xfs",
|
|
"devices": {
|
|
"lvm": {
|
|
"type": "org.osbuild.loopback",
|
|
"options": {
|
|
"filename": "disk.img",
|
|
"start": {
|
|
"mpp-format-int": "{image.layout['lvm'].start}"
|
|
},
|
|
"size": {
|
|
"mpp-format-int": "{image.layout['lvm'].size}"
|
|
}
|
|
}
|
|
},
|
|
"device": {
|
|
"type": "org.osbuild.lvm2.lv",
|
|
"parent": "lvm",
|
|
"options": {
|
|
"volume": "root"
|
|
}
|
|
}
|
|
},
|
|
"options": {
|
|
"uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
|
|
"label": "root"
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.copy",
|
|
"inputs": {
|
|
"tree": {
|
|
"type": "org.osbuild.tree",
|
|
"origin": "org.osbuild.pipeline",
|
|
"references": [
|
|
"name:image-tree"
|
|
]
|
|
}
|
|
},
|
|
"options": {
|
|
"paths": [
|
|
{
|
|
"from": "input://tree/",
|
|
"to": "mount://root/"
|
|
}
|
|
]
|
|
},
|
|
"devices": {
|
|
"efi": {
|
|
"type": "org.osbuild.loopback",
|
|
"options": {
|
|
"filename": "disk.img",
|
|
"start": {
|
|
"mpp-format-int": "{image.layout['efi'].start}"
|
|
},
|
|
"size": {
|
|
"mpp-format-int": "{image.layout['efi'].size}"
|
|
}
|
|
}
|
|
},
|
|
"boot": {
|
|
"type": "org.osbuild.loopback",
|
|
"options": {
|
|
"filename": "disk.img",
|
|
"start": {
|
|
"mpp-format-int": "{image.layout['boot'].start}"
|
|
},
|
|
"size": {
|
|
"mpp-format-int": "{image.layout['boot'].size}"
|
|
}
|
|
}
|
|
},
|
|
"lvm": {
|
|
"type": "org.osbuild.loopback",
|
|
"options": {
|
|
"filename": "disk.img",
|
|
"start": {
|
|
"mpp-format-int": "{image.layout['lvm'].start}"
|
|
},
|
|
"size": {
|
|
"mpp-format-int": "{image.layout['lvm'].size}"
|
|
}
|
|
}
|
|
},
|
|
"root": {
|
|
"type": "org.osbuild.lvm2.lv",
|
|
"parent": "lvm",
|
|
"options": {
|
|
"volume": "root"
|
|
}
|
|
}
|
|
},
|
|
"mounts": [
|
|
{
|
|
"name": "root",
|
|
"type": "org.osbuild.xfs",
|
|
"source": "root",
|
|
"target": "/"
|
|
},
|
|
{
|
|
"name": "boot",
|
|
"type": "org.osbuild.ext4",
|
|
"source": "boot",
|
|
"target": "/boot"
|
|
},
|
|
{
|
|
"name": "efi",
|
|
"type": "org.osbuild.fat",
|
|
"source": "efi",
|
|
"target": "/boot/efi"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"type": "org.osbuild.grub2.inst",
|
|
"options": {
|
|
"platform": "i386-pc",
|
|
"filename": "disk.img",
|
|
"location": {
|
|
"mpp-format-int": "{image.layout['bios-boot'].start}"
|
|
},
|
|
"core": {
|
|
"type": "mkimage",
|
|
"partlabel": "gpt",
|
|
"filesystem": "ext4"
|
|
},
|
|
"prefix": {
|
|
"type": "partition",
|
|
"partlabel": {
|
|
"mpp-format-string": "{image.layout.label}"
|
|
},
|
|
"number": {
|
|
"mpp-format-int": "{image.layout['boot'].index}"
|
|
},
|
|
"path": "/grub2"
|
|
}
|
|
}
|
|
},
|
|
{
|
|
"type": "org.osbuild.lvm2.metadata",
|
|
"devices": {
|
|
"device": {
|
|
"type": "org.osbuild.loopback",
|
|
"options": {
|
|
"filename": "disk.img",
|
|
"start": {
|
|
"mpp-format-int": "{image.layout['lvm'].start}"
|
|
},
|
|
"size": {
|
|
"mpp-format-int": "{image.layout['lvm'].size}"
|
|
},
|
|
"lock": true
|
|
}
|
|
}
|
|
},
|
|
"options": {
|
|
"vg_name": "osbuild",
|
|
"creation_host": "osbuild",
|
|
"description": "Built with osbuild"
|
|
}
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"name": "qcow2",
|
|
"build": "name:build",
|
|
"stages": [
|
|
{
|
|
"type": "org.osbuild.qemu",
|
|
"inputs": {
|
|
"image": {
|
|
"type": "org.osbuild.files",
|
|
"origin": "org.osbuild.pipeline",
|
|
"references": {
|
|
"name:image": {
|
|
"file": "disk.img"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"options": {
|
|
"filename": "disk.qcow2",
|
|
"format": {
|
|
"type": "qcow2",
|
|
"compat": "1.1"
|
|
}
|
|
}
|
|
}
|
|
]
|
|
}
|
|
]
|
|
}
|