mkosi-initrd: Install btrfs-progs

Even if fsck.btrfs doesn't do anything particularly useful, given we
install the fs tools of all the other filesystems, let's install btrfs-progs
as well. This is also useful when using systemd-repart to create the
root filesystem on first boot.

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf
index f4d1b85d3f87900700881ccd4ef7bbea8f528229..e26b20b850bf22484816598ab81240f4c28cdb39 100644 (file)
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf
@@ -7,6 +7,7 @@ Distribution=arch
 Packages=
         gzip # For compressed keymap unpacking by loadkeys
 
+        btrfs-progs
         e2fsprogs
         xfsprogs
         erofs-utils

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf
index b0bf974efb2f9d0426c3ab5c25c0765f3460e70b..8bb5de031692fb0335bbb497ce824597cb321f72 100644 (file)
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf
@@ -17,5 +17,3 @@ Packages=
         e2fsprogs
         xfsprogs
         dosfstools
-
-        # fsck.btrfs is a dummy, checking is done in the kernel.

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure.conf
index d591fbc63fc358289a35e730b2afad7ef9a987fc..976c81ec4cc5675f1fb6d1f94abc91bdf75f7687 100644 (file)
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure.conf
@@ -5,4 +5,5 @@ Distribution=azure
 
 [Content]
 Packages=
+        btrfs-progs
         util-linux

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
index a3a75a413797dd1f0cc5c9b5c74494476cb2e025..facf2b059f85d04b249730062829a1bbf2d44a8b 100644 (file)
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
@@ -5,5 +5,5 @@ Repositories=epel
 
 [Content]
 Packages=
-        # provides fsck.erofs
+        btrfs-progs
         erofs-utils

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
index 9abb016afb1c7606837191309021b7bd15e75fc4..2d352292da6a04c39fa4c42de3b2a16da9bf96bb 100644 (file)
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
@@ -16,6 +16,7 @@ Packages=
 
         # xfsprogs pulls in python on Debian (???) and XFS generally
         # isn't used on Debian so we don't install xfsprogs.
+        btrfs-progs
         e2fsprogs
         erofs-utils
         dosfstools

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf
index 4bc811d53175db26f78afafb493c556084d0d500..001efec996da536e008fa6e2e9989c26cb10fe6e 100644 (file)
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf
@@ -5,6 +5,7 @@ Distribution=fedora
 
 [Content]
 Packages=
+        btrfs-progs
         libfido2
         util-linux-core
         erofs-utils

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf
index 20bbe170894b8a52b235ddf0676339cbfde28941..5069520b54c6da19672f0cf89d073f2f89169bab 100644 (file)
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf
@@ -22,13 +22,12 @@ Packages=
         libtss2-tcti-device0
 
         # File system checkers for supported root file systems
+        btrfs-progs
         e2fsprogs
         xfsprogs
         erofs-utils
         dosfstools
 
-        # fsck.btrfs is a dummy, checking is done in the kernel.
-
         util-linux
 
 RemovePackages=

diff --git a/tests/test_initrd.py b/tests/test_initrd.py
index 7865295d2fde046a0effe675be3c85681a9b4861..2e4f03eb49a96dfc81ba3ba3065a910fdebc6760 100644 (file)
--- a/tests/test_initrd.py
+++ b/tests/test_initrd.py
@@ -223,11 +223,11 @@ def test_initrd_size(config: ImageConfig) -> None:
 
         # The fallback value is for CentOS and related distributions.
         maxsize = 1024**2 * {
-            Distribution.fedora: 61,
-            Distribution.debian: 60,
-            Distribution.ubuntu: 55,
-            Distribution.arch: 81,
-            Distribution.opensuse: 63,
-        }.get(config.distribution, 56)
+            Distribution.fedora: 63,
+            Distribution.debian: 61,
+            Distribution.ubuntu: 56,
+            Distribution.arch: 82,
+            Distribution.opensuse: 64,
+        }.get(config.distribution, 57)
 
         assert (Path(image.output_dir) / "image.initrd").stat().st_size <= maxsize