From edebd133afa3443df356b41c5c4e587eb9ef5c59 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 10 Oct 2025 16:02:12 -0400 Subject: teams/cloud: Drop /boot partition and use a Btrfs subvolume for /boot This lets us free up the space allocated for the partition and gives us dynamically allocated space for boot data like we have with the rest of the operating system. We do not do this for s390x because zipl does not support it. Reference: https://fedoraproject.org/wiki/Changes/BtrfsBootForCloud --- teams/cloud/cloud.xml | 27 ++++++++++++++++++--------- teams/cloud/vagrant.xml | 6 ++++-- 2 files changed, 22 insertions(+), 11 deletions(-) (limited to 'teams/cloud') diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml index 33f11a4..3a99ce7 100644 --- a/teams/cloud/cloud.xml +++ b/teams/cloud/cloud.xml @@ -33,12 +33,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 earlyprintk=ttyS0 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > + @@ -53,12 +54,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 earlyprintk=ttyAMA0 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > + @@ -73,13 +75,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="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > 5 + @@ -93,13 +96,14 @@ 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="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > 5 + @@ -113,7 +117,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="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > @@ -121,6 +125,7 @@ 10 + @@ -134,7 +139,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="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > @@ -142,6 +147,7 @@ 10 + @@ -155,13 +161,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="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > 5 + @@ -175,13 +182,14 @@ 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="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > 5 + @@ -195,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="2000" bootfilesystem="ext4" firmware="ofw" + bootpartition="false" firmware="ofw" rootfs_label="fedora" > 5 + diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml index 8a9383b..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="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > @@ -23,6 +23,7 @@ + @@ -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="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > @@ -44,6 +45,7 @@ + -- cgit v1.3.1+13