From 6f1f13ca9f8db424c613332ec4739e53b2db6fdf Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 27 Jun 2024 12:49:59 +0200
Subject: [PATCH 1/3] mkosi: Enable hyperscale-packages-experimental for CentOS

This gets us a kernel with btrfs support.
---
 mkosi.conf.d/10-centos.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mkosi.conf.d/10-centos.conf b/mkosi.conf.d/10-centos.conf
index ae2706c791..ee8d0e5581 100644
--- a/mkosi.conf.d/10-centos.conf
+++ b/mkosi.conf.d/10-centos.conf
@@ -8,3 +8,4 @@ Distribution=centos
 Repositories=epel
              epel-next
              hyperscale-packages-main
+             hyperscale-packages-experimental

From 48e7d0e91e1c9d86c660a67a8ca29aa79deee33d Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 27 Jun 2024 15:45:44 +0200
Subject: [PATCH 2/3] mkosi: Install btrfs-progs on CentOS as well

---
 mkosi.images/system/mkosi.conf                               | 2 ++
 mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf          | 2 --
 mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 2 --
 mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf        | 4 ----
 mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf      | 2 --
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 562650a8ff..d1ab822132 100644
--- a/mkosi.images/system/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf
@@ -17,6 +17,7 @@ ExtraTrees=
 PostInstallationScripts=mkosi.sanitizers.chroot
 
 InitrdPackages=
+        btrfs-progs
         findutils
         grep
         sed
@@ -26,6 +27,7 @@ Packages=
         attr
         bash-completion
         bpftrace
+        btrfs-progs
         clang
         coreutils
         curl
diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
index 036b0a39a6..7072d08afa 100644
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
@@ -20,7 +20,6 @@ VolatilePackages=
 Packages=
         bind
         bpf
-        btrfs-progs
         compiler-rt
         compsize
         cryptsetup
@@ -61,7 +60,6 @@ Packages=
         vim
 
 InitrdPackages=
-        btrfs-progs
         compiler-rt
         tpm2-tools
 
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index 5ba20b9ed7..c1f74b1110 100644
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -43,7 +43,6 @@ Packages=
         ^libubsan[0-9]+$
         apt
         bind9-dnsutils
-        btrfs-progs
         cryptsetup-bin
         dbus-broker
         dbus-user-session
@@ -83,7 +82,6 @@ Packages=
         xxd
 
 InitrdPackages=
-        btrfs-progs
         libclang-rt-dev
         tpm2-tools
 
diff --git a/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
index 71e8872ae5..5e39902461 100644
--- a/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
@@ -10,7 +10,6 @@ Environment=
         GIT_COMMIT=8153d9b0f978d633c8422011d4c547ae1f0e51a4
 
 Packages=
-        btrfs-progs
         compsize
         dnf5
         f2fs-tools
@@ -18,6 +17,3 @@ Packages=
         # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules)
         kernel-modules-extra
         kernel-modules-internal
-
-InitrdPackages=
-        btrfs-progs
diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
index 9d9566d905..8c3a3d3cda 100644
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -32,7 +32,6 @@ VolatilePackages=
 Packages=
         bind-utils
         bpftool
-        btrfs-progs
         cryptsetup
         device-mapper
         dhcp-server
@@ -88,7 +87,6 @@ Packages=
         xz
 
 InitrdPackages=
-        btrfs-progs
         clang
         kmod
         libkmod2

From 93440db8b5eae1244aaf5fecfa68050a8b26f3e3 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 27 Jun 2024 12:08:51 +0200
Subject: [PATCH 3/3] mkosi: Switch back to btrfs

Now that we're running on Noble instead of Jammy btrfs has the temp_fsid
feature which means we can mount the same image multiple times so let's
switch back to btrfs instead of ext4 as the filesystem as btrfs properly
records timestamps when building filesystems from a root directory unlike
ext4.
---
 mkosi.images/system/mkosi.repart/10-root.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkosi.images/system/mkosi.repart/10-root.conf b/mkosi.images/system/mkosi.repart/10-root.conf
index 715b925463..3c25dbfb14 100644
--- a/mkosi.images/system/mkosi.repart/10-root.conf
+++ b/mkosi.images/system/mkosi.repart/10-root.conf
@@ -2,7 +2,7 @@
 
 [Partition]
 Type=root
-Format=ext4
+Format=btrfs
 CopyFiles=/
 SizeMinBytes=8G
 SizeMaxBytes=8G