#228 [DNM] teams/cloud: Drop /boot partition and use a Btrfs subvolume for /boot
Opened 2 months ago by ngompa. Modified 2 months ago

file modified
+18 -9
@@ -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"

  		      >

  			<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>
@@ -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"

  		      >

  			<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>
@@ -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"

  		      >

  			<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>
@@ -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"

  		      >

  			<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>
@@ -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"

  		      >

  			<bootloader name="grub2" bls="true" timeout="0"/>
@@ -121,6 +125,7 @@ 

  			<size unit="G">10</size>

  			<systemdisk>

  				<volume name="@root=root"/>

+ 				<volume name="boot" parent="/"/>

  				<volume name="home" parent="/"/>

  				<volume name="var" parent="/"/>

  			</systemdisk>
@@ -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"

  		      >

  			<bootloader name="grub2" bls="true" timeout="0"/>
@@ -142,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>
@@ -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"

  		      >

  			<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>
@@ -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"

  		      >

  			<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>
@@ -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"

  		      >

  			<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>

file modified
+4 -2
@@ -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"

  		      >

  			<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="2000" 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>

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

rebased onto a6a0df3

2 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/6fd5a6568ed24893b6e1ca42a6a02394

rebased onto a6a0df3

2 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/8ae7cf024f274059a0620d3b5b735def