Diffstat (limited to 'teams/cloud/cloud.xml')
| -rw-r--r-- | teams/cloud/cloud.xml | 149 |
1 files changed, 125 insertions, 24 deletions
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml index 3d6ef09..3a99ce7 100644 --- a/teams/cloud/cloud.xml +++ b/teams/cloud/cloud.xml @@ -28,17 +28,39 @@ <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 net.ifnames=0 console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0" + 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> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <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> @@ -48,18 +70,62 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64"> + <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 net.ifnames=0 console=tty1 console=ttyS0,115200n8" + 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" timeout="0"/> + <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> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <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="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> @@ -68,19 +134,20 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64"> + <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 net.ifnames=0 console=ttyS0,38400n8d" + kernelcmdline="no_timer_check console=ttyAMA0,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" timeout="0"/> + <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> @@ -89,18 +156,40 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64"> + <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 net.ifnames=0 console=tty1 console=ttyS0,115200n8" + 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" console="serial" timeout="0"/> + <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> @@ -112,15 +201,16 @@ <preferences profiles="Cloud-Base-Generic" arch="ppc64le"> <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 net.ifnames=0 console=tty1 console=ttyS0,115200n8" - devicepersistency="by-uuid" target_blocksize="4096" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw" + kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" firmware="ofw" rootfs_label="fedora" > - <bootloader name="grub2" console="serial" timeout="0"/> + <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> @@ -132,12 +222,12 @@ <preferences profiles="Cloud-Base-Generic" arch="s390x"> <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 net.ifnames=0 console=tty1 console=ttyS0,115200n8 dasd_mod.dasd=ipldev" - devicepersistency="by-uuid" target_blocksize="4096" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" + kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" rootfs_label="fedora" > - <bootloader name="zipl" targettype="CDL" timeout="1"/> + <bootloader name="zipl" timeout="1"/> <size unit="G">5</size> <systemdisk> <volume name="@root=root"/> @@ -149,11 +239,12 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64,riscv64"> <type image="oem" format="qcow2" firmware="uefi" efipartsize="1000" bootpartition="false" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="true" + kernelcmdline="systemd.firstboot=off" devicepersistency="by-uuid" rootfs_label="fedora" initrd_system="none" @@ -178,11 +269,13 @@ <namedCollection name="cloud-server-environment"/> <ignore name="dracut-config-rescue"/> <ignore name="firewalld"/> + <ignore name="fwupd"/> <ignore name="kernel"/> <ignore name="*-firmware"/> <ignore name="geolite2-city"/> <ignore name="geolite2-country"/> <ignore name="plymouth"/> + <package name="btrfs-progs"/> <package name="python3-dnf-plugin-tracer"/> <package name="glibc-langpack-en"/> </packages> @@ -190,16 +283,24 @@ <namedCollection name="cloud-server-environment"/> <ignore name="dracut-config-rescue"/> <ignore name="firewalld"/> + <ignore name="fwupd"/> <ignore name="kernel"/> <ignore name="[a-oq-z]*-firmware"/> <ignore name="geolite2-city"/> <ignore name="geolite2-country"/> <ignore name="plymouth"/> + <package name="btrfs-progs"/> <package name="python3-dnf-plugin-tracer"/> <package name="glibc-langpack-en"/> </packages> + <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-AmazonEC2"> + <package name="amazon-ec2-utils"/> + <package name="awscli2"/> + <package name="ec2-instance-connect"/> + </packages> <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Azure"> <package name="WALinuxAgent"/> + <package name="azure-vm-utils"/> <package name="kernel-modules"/> <package name="hyperv-daemons"/> </packages> |