From 425606f6d496a433c076f9fae01d1eecf24f0007 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Jul 02 2023 08:01:08 +0000
Subject: [PATCH 1/2] rootfs: Add fstab.script to fix ESP and correctly label the filesystem


This is based on the fixes done for the Fedora Asahi images.

---

diff --git a/root/etc/fstab.script b/root/etc/fstab.script
new file mode 100755
index 0000000..94e99db
--- /dev/null
+++ b/root/etc/fstab.script
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Set ESP mount options to match what Fedora does
+# https://github.com/OSInside/kiwi/issues/2201
+gawk -i inplace '$2 == "/boot/efi" { $4 = $4",umask=0077,shortname=winnt" } { print $0 }' /etc/fstab
+
+# Run selinux relabel at the right time
+# https://github.com/OSInside/kiwi/issues/2192
+# https://github.com/OSInside/kiwi/pull/2282#issuecomment-1514399308
+setfiles -F -p -c /etc/selinux/targeted/policy/policy.* -e /proc -e /sys -e /dev /etc/selinux/targeted/contexts/files/file_contexts /

From ebe2f84ccec0af2fdc790a307d5a043d711a4d02 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Jul 02 2023 08:01:08 +0000
Subject: [PATCH 2/2] platforms: Ensure Btrfs is zstd compressed on disk images


This aligns us with our defaults when installing with Anaconda.

---

diff --git a/platforms/cloud.xml b/platforms/cloud.xml
index 0f4db36..9af746d 100644
--- a/platforms/cloud.xml
+++ b/platforms/cloud.xml
@@ -17,7 +17,7 @@
 		</profile>
 	</profiles>
 	<preferences profiles="Azure">
-		<type image="oem" filesystem="btrfs" kernelcmdline="USE_BY_UUID_DEVICE_NAMES=1 earlyprintk=ttyS0 console=ttyS0 rootdelay=300 net.ifnames=0 dis_ucode_ldr scsi_mod.use_blk_mq=1 multipath=off" devicepersistency="by-uuid" formatoptions="force_size" format="vhd-fixed" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi">
+		<type image="oem" filesystem="btrfs" kernelcmdline="USE_BY_UUID_DEVICE_NAMES=1 earlyprintk=ttyS0 console=ttyS0 rootdelay=300 net.ifnames=0 dis_ucode_ldr scsi_mod.use_blk_mq=1 multipath=off" devicepersistency="by-uuid" formatoptions="force_size" format="vhd-fixed" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" fsmountoptions="compress=zstd:1">
 			<bootloader name="grub2" console="serial" timeout="1" timeout_style="countdown"/>
 			<systemdisk>
 				<volume name="home"/>
@@ -31,7 +31,7 @@
 		</type>
 	</preferences>
 	<preferences profiles="AWSEC2">
-		<type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0 net.ifnames=0 nvme_core.io_timeout=4294967295 nvme_core.admin_timeout=4294967295 8250.nr_uarts=4 dis_ucode_ldr multipath=off" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi">
+		<type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0 net.ifnames=0 nvme_core.io_timeout=4294967295 nvme_core.admin_timeout=4294967295 8250.nr_uarts=4 dis_ucode_ldr multipath=off" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" fsmountoptions="compress=zstd:1">
 			<bootloader name="grub2" timeout="1"/>
 			<size unit="G">5</size>
 			<systemdisk>
@@ -45,7 +45,7 @@
 		</type>
 	</preferences>
 	<preferences profiles="GCE">
-		<type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0,38400n8 multipath=off net.ifnames=0 dis_ucode_ldr" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" format="gce" firmware="uefi">
+		<type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0,38400n8 multipath=off net.ifnames=0 dis_ucode_ldr" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" format="gce" firmware="uefi" fsmountoptions="compress=zstd:1">
 			<bootloader name="grub2" timeout="1"/>
 			<size unit="G">5</size>
 			<systemdisk>
@@ -59,7 +59,7 @@
 		</type>
 	</preferences>
 	<preferences profiles="OpenStack">
-		<type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0 net.ifnames=0 dis_ucode_ldr" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" format="qcow2">
+		<type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0 net.ifnames=0 dis_ucode_ldr" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" format="qcow2" fsmountoptions="compress=zstd:1">
 			<bootloader name="grub2" console="serial" timeout="1"/>
 			<size unit="G">5</size>
 			<systemdisk>
diff --git a/platforms/vagrant.xml b/platforms/vagrant.xml
index d1973d5..0ace4d8 100644
--- a/platforms/vagrant.xml
+++ b/platforms/vagrant.xml
@@ -5,7 +5,7 @@
 		</profile>
 	</profiles>
 	<preferences profiles="Vagrant">
-		<type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0 net.ifnames=0 dis_ucode_ldr" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" format="vagrant">
+		<type image="oem" filesystem="btrfs" kernelcmdline="console=ttyS0 net.ifnames=0 dis_ucode_ldr" devicepersistency="by-label" bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" format="vagrant" fsmountoptions="compress=zstd:1">
 			<bootloader name="grub2" console="serial" timeout="1"/>
 			<size unit="G">5</size>
 			<systemdisk>