aboutsummaryrefslogtreecommitdiff
path: root/teams/cloud
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'teams/cloud')
-rw-r--r--teams/cloud/cloud.xml110
-rw-r--r--teams/cloud/container.xml46
-rw-r--r--teams/cloud/vagrant.xml6
-rw-r--r--teams/cloud/wsl.xml4
4 files changed, 121 insertions, 45 deletions
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index 1bbd2c5..3a99ce7 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -28,17 +28,18 @@
<requires profile="Cloud-Base-Generic"/>
</profile>
</profiles>
- <preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-Azure" arch="x86_64">
<type image="oem" format="vhd-fixed" formatoptions="force_size"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
<systemdisk>
<volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -48,18 +49,61 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-Azure" arch="aarch64">
+ <type image="oem" format="vhd-fixed" formatoptions="force_size"
+ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
+ kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off"
+ devicepersistency="by-uuid"
+ bootpartition="false" efipartsize="100" firmware="uefi"
+ rootfs_label="fedora"
+ >
+ <bootloader name="grub2" console="serial" timeout="0"/>
+ <systemdisk>
+ <volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
+ <volume name="home" parent="/"/>
+ <volume name="var" parent="/"/>
+ </systemdisk>
+ <size unit="G">5</size>
+ <oemconfig>
+ <oem-resize>false</oem-resize>
+ </oemconfig>
+ </type>
+ </preferences>
+ <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64">
<type image="oem"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
+ rootfs_label="fedora"
+ >
+ <bootloader name="grub2" bls="true" timeout="0"/>
+ <size unit="G">5</size>
+ <systemdisk>
+ <volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
+ <volume name="home" parent="/"/>
+ <volume name="var" parent="/"/>
+ </systemdisk>
+ <oemconfig>
+ <oem-resize>false</oem-resize>
+ </oemconfig>
+ </type>
+ </preferences>
+ <preferences profiles="Cloud-Base-AmazonEC2" arch="aarch64">
+ <type image="oem"
+ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
+ kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
+ devicepersistency="by-uuid"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" timeout="0"/>
<size unit="G">5</size>
<systemdisk>
<volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -68,12 +112,34 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64">
+ <preferences profiles="Cloud-Base-GCE" arch="x86_64">
<type image="oem" format="gce"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
+ rootfs_label="fedora"
+ >
+ <bootloader name="grub2" bls="true" timeout="0"/>
+ <!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G -->
+ <size unit="G">10</size>
+ <systemdisk>
+ <volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
+ <volume name="home" parent="/"/>
+ <volume name="var" parent="/"/>
+ </systemdisk>
+ <oemconfig>
+ <oem-resize>false</oem-resize>
+ </oemconfig>
+ </type>
+ </preferences>
+ <preferences profiles="Cloud-Base-GCE" arch="aarch64">
+ <type image="oem" format="gce"
+ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
+ kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off"
+ devicepersistency="by-uuid"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" timeout="0"/>
@@ -81,6 +147,7 @@
<size unit="G">10</size>
<systemdisk>
<volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -89,18 +156,40 @@
</oemconfig>
</type>
</preferences>
- <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64,riscv64">
+ <preferences profiles="Cloud-Base-Generic" arch="x86_64,riscv64">
<type image="oem" format="qcow2"
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
+ rootfs_label="fedora"
+ >
+ <bootloader name="grub2" bls="true" console="serial" timeout="0"/>
+ <size unit="G">5</size>
+ <systemdisk>
+ <volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
+ <volume name="home" parent="/"/>
+ <volume name="var" parent="/"/>
+ </systemdisk>
+ <oemconfig>
+ <oem-resize>false</oem-resize>
+ </oemconfig>
+ </type>
+ </preferences>
+ <preferences profiles="Cloud-Base-Generic" arch="aarch64">
+ <type image="oem" format="qcow2"
+ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
+ kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off"
+ devicepersistency="by-uuid"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
<size unit="G">5</size>
<systemdisk>
<volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -114,13 +203,14 @@
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
+ bootpartition="false" firmware="ofw"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
<size unit="G">5</size>
<systemdisk>
<volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -134,7 +224,7 @@
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="ext4"
+ bootpartition="true" bootpartsize="2000" bootfilesystem="ext4"
rootfs_label="fedora"
>
<bootloader name="zipl" timeout="1"/>
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml
index ae0b2da..8b4b963 100644
--- a/teams/cloud/container.xml
+++ b/teams/cloud/container.xml
@@ -24,14 +24,9 @@
<labels>
<label name="org.opencontainers.image.vendor" value="Fedora Project"/>
<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
- <label name="org.opencontainers.image.license" value="MIT"/>
- <label name="org.opencontainers.image.name" value="fedora"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora"/>
<label name="org.opencontainers.image.version" value="rawhide"/>
- <!-- Legacy attributes for backward compatibility -->
- <label name="vendor" value="Fedora Project"/>
- <label name="license" value="MIT"/>
- <label name="name" value="fedora"/>
- <label name="version" value="rawhide"/>
</labels>
<environment>
<env name="container" value="oci"/>
@@ -55,14 +50,9 @@
<labels>
<label name="org.opencontainers.image.vendor" value="Fedora Project"/>
<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
- <label name="org.opencontainers.image.license" value="MIT"/>
- <label name="org.opencontainers.image.name" value="fedora-minimal"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora-minimal"/>
<label name="org.opencontainers.image.version" value="rawhide"/>
- <!-- Legacy attributes for backward compatibility -->
- <label name="vendor" value="Fedora Project"/>
- <label name="license" value="MIT"/>
- <label name="name" value="fedora-minimal"/>
- <label name="version" value="rawhide"/>
</labels>
<environment>
<env name="container" value="oci"/>
@@ -86,14 +76,9 @@
<labels>
<label name="org.opencontainers.image.vendor" value="Fedora Project"/>
<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
- <label name="org.opencontainers.image.license" value="MIT"/>
- <label name="org.opencontainers.image.name" value="fedora-init"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora-init"/>
<label name="org.opencontainers.image.version" value="rawhide"/>
- <!-- Legacy attributes for backward compatibility -->
- <label name="vendor" value="Fedora Project"/>
- <label name="license" value="MIT"/>
- <label name="name" value="fedora-init"/>
- <label name="version" value="rawhide"/>
</labels>
<stopsignal>SIGRTMIN+3</stopsignal>
</containerconfig>
@@ -114,15 +99,10 @@
<labels>
<label name="org.opencontainers.image.vendor" value="Fedora Project"/>
<label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/>
- <label name="org.opencontainers.image.license" value="MIT"/>
- <label name="org.opencontainers.image.name" value="fedora-toolbox"/>
+ <label name="org.opencontainers.image.licenses" value="MIT"/>
+ <label name="org.opencontainers.image.title" value="fedora-toolbox"/>
<label name="org.opencontainers.image.version" value="rawhide"/>
<label name="com.github.containers.toolbox" value="true"/>
- <!-- Legacy attributes for backward compatibility -->
- <label name="vendor" value="Fedora Project"/>
- <label name="license" value="MIT"/>
- <label name="name" value="fedora-toolbox"/>
- <label name="version" value="rawhide"/>
</labels>
<environment>
<env name="container" value="oci"/>
@@ -160,6 +140,7 @@
<package name="rpm"/>
<package name="shadow-utils"/>
<package name="util-linux-core"/>
+ <package name="gawk"/>
</packages>
<packages type="bootstrap" profiles="Container-Base-Generic-Minimal">
<ignore name="glibc-langpack-en"/>
@@ -250,13 +231,12 @@
<package name="man-db"/>
<package name="man-pages"/>
<package name="mesa-dri-drivers"/>
- <package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64,riscv64"/> <!-- doesn't exist in s390x -->
<package name="mesa-vulkan-drivers"/>
<package name="mtr"/>
<package name="nss-mdns"/>
<package name="openssh-clients"/>
<package name="openssl"/>
- <package name="p11-kit"/>
+ <package name="p11-kit-client"/>
<package name="pam"/>
<package name="pigz"/>
<package name="policycoreutils"/>
@@ -294,4 +274,10 @@
<package name="systemd-resolved"/>
<package name="xkeyboard-config"/>
</packages>
+ <packages type="bootstrap" profiles="Container-Base-Generic-Minimal,Container-Base-Generic,Container-Toolbox">
+ <package name="systemd-standalone-tmpfiles"/>
+ </packages>
+ <packages type="uninstall" profiles="Container-Base-Generic-Minimal,Container-Base-Generic,Container-Toolbox">
+ <package name="systemd-standalone-tmpfiles"/>
+ </packages>
</image>
diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml
index d25b163..301b08c 100644
--- a/teams/cloud/vagrant.xml
+++ b/teams/cloud/vagrant.xml
@@ -15,7 +15,7 @@
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
@@ -23,6 +23,7 @@
<vagrantconfig provider="libvirt" virtualsize="5"/>
<systemdisk>
<volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
@@ -36,7 +37,7 @@
filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
devicepersistency="by-uuid"
- bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
+ bootpartition="false" efipartsize="100" firmware="uefi"
rootfs_label="fedora"
>
<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
@@ -44,6 +45,7 @@
<vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="5"/>
<systemdisk>
<volume name="@root=root"/>
+ <volume name="boot" parent="/"/>
<volume name="home" parent="/"/>
<volume name="var" parent="/"/>
</systemdisk>
diff --git a/teams/cloud/wsl.xml b/teams/cloud/wsl.xml
index 9c36b91..ffafb79 100644
--- a/teams/cloud/wsl.xml
+++ b/teams/cloud/wsl.xml
@@ -3,7 +3,7 @@
<profile name="WSL-Base" description="Windows Subsystem for Linux Base"/>
</profiles>
<preferences profiles="WSL-Base">
- <type image="tbz"/>
+ <type image="wsl"/>
<timezone>Etc/UTC</timezone>
<locale>en_US</locale>
<rpm-locale-filtering>false</rpm-locale-filtering>
@@ -15,9 +15,7 @@
<package name="dnf5"/>
<package name="dnf5-plugins"/>
<package name="fedora-release-wsl"/>
- <package name="policycoreutils"/>
<package name="rpm"/>
- <package name="selinux-policy-targeted"/>
</packages>
<packages type="image" patternType="plusRecommended" profiles="WSL-Base">
<package name="attr"/>
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 22:25:08 +0000