| -rw-r--r-- | teams/cloud/cloud.xml | 32 | ||||
| -rw-r--r-- | teams/cloud/vagrant.xml | 16 |
2 files changed, 6 insertions, 42 deletions
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml index d2c00a0..78b1477 100644 --- a/teams/cloud/cloud.xml +++ b/teams/cloud/cloud.xml @@ -29,13 +29,7 @@ </profile> </profiles> <preferences profiles="Cloud-Base-Azure"> - <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" - devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" - rootfs_label="fedora" - > + <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0" devicepersistency="by-uuid" formatoptions="force_size" format="vhd-fixed" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> <bootloader name="grub2" console="serial" timeout="0"/> <systemdisk> <volume name="@root=root"/> @@ -49,13 +43,7 @@ </type> </preferences> <preferences profiles="Cloud-Base-AmazonEC2"> - <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" - devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" - rootfs_label="fedora" - > + <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> <bootloader name="grub2" timeout="0"/> <size unit="G">5</size> <systemdisk> @@ -69,13 +57,7 @@ </type> </preferences> <preferences profiles="Cloud-Base-GCE"> - <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" - devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" - rootfs_label="fedora" - > + <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check net.ifnames=0 console=ttyS0,38400n8d" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" format="gce" firmware="uefi" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> <bootloader name="grub2" timeout="0"/> <size unit="G">5</size> <systemdisk> @@ -89,13 +71,7 @@ </type> </preferences> <preferences profiles="Cloud-Base-Generic"> - <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" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" - rootfs_label="fedora" - > + <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="qcow2" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> <bootloader name="grub2" timeout="0"/> <size unit="G">5</size> <systemdisk> diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml index 84d1ad7..9c784ff 100644 --- a/teams/cloud/vagrant.xml +++ b/teams/cloud/vagrant.xml @@ -11,13 +11,7 @@ </profile> </profiles> <preferences profiles="Cloud-Base-Vagrant-libvirt"> - <type image="oem" format="vagrant" - 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 net.ifnames=0 biosdevname=0" - devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" - rootfs_label="fedora" - > + <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="vagrant" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> <bootloader name="grub2" console="serial" timeout="1"/> <size unit="G">5</size> <vagrantconfig provider="libvirt" virtualsize="5"/> @@ -32,13 +26,7 @@ </type> </preferences> <preferences profiles="Cloud-Base-Vagrant-VirtualBox"> - <type image="oem" format="vagrant" - 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 net.ifnames=0 biosdevname=0" - devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" - rootfs_label="fedora" - > + <type image="oem" filesystem="btrfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" devicepersistency="by-uuid" bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" format="vagrant" fsmountoptions="compress=zstd:1" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora"> <bootloader name="grub2" console="serial" timeout="1"/> <size unit="G">5</size> <vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="5"/> |