| -rw-r--r-- | teams/cloud/cloud.xml | 27 | ||||
| -rw-r--r-- | teams/cloud/vagrant.xml | 6 |
2 files changed, 11 insertions, 22 deletions
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml index 3a99ce7..33f11a4 100644 --- a/teams/cloud/cloud.xml +++ b/teams/cloud/cloud.xml @@ -33,13 +33,12 @@ 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="false" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" 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> @@ -54,13 +53,12 @@ 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" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" 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> @@ -75,14 +73,13 @@ 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="false" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" 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> @@ -96,14 +93,13 @@ 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" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" 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> @@ -117,7 +113,7 @@ 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" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" timeout="0"/> @@ -125,7 +121,6 @@ <size unit="G">10</size> <systemdisk> <volume name="@root=root"/> - <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -139,7 +134,7 @@ 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" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" timeout="0"/> @@ -147,7 +142,6 @@ <size unit="G">10</size> <systemdisk> <volume name="@root=root"/> - <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -161,14 +155,13 @@ 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="false" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" 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> @@ -182,14 +175,13 @@ 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" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" 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> @@ -203,14 +195,13 @@ 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="false" firmware="ofw" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" 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> diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml index 301b08c..8a9383b 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="false" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="1"/> @@ -23,7 +23,6 @@ <vagrantconfig provider="libvirt" virtualsize="5"/> <systemdisk> <volume name="@root=root"/> - <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -37,7 +36,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="false" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="1"/> @@ -45,7 +44,6 @@ <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> |