From 68ee9771145464949d36d62a0ec687ecfb39290a Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 16 Jul 2024 12:07:38 +0200
Subject: mkosi: Build initrd as a subimage

Let's make things a little more consistent and build the initrd
explicitly as a subimage as well instead of relying on mkosi building
it as part of the main image build.

We drop the opensuse initrd postinst script as we don't use erofs by
default anymore. We can always reintroduce it again later if needed.
---
 mkosi.conf.d/10-arch/mkosi.conf                |  9 ---------
 mkosi.conf.d/10-centos-fedora/mkosi.conf       |  7 -------
 mkosi.conf.d/10-debian-ubuntu/mkosi.conf       | 10 ----------
 mkosi.conf.d/10-fedora/mkosi.conf              |  3 ---
 mkosi.conf.d/10-opensuse/initrd/mkosi.postinst |  7 -------
 mkosi.conf.d/10-opensuse/mkosi.conf            | 13 -------------
 6 files changed, 49 deletions(-)
 delete mode 100755 mkosi.conf.d/10-opensuse/initrd/mkosi.postinst

(limited to 'mkosi.conf.d')

diff --git a/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.conf.d/10-arch/mkosi.conf
index 7b719ff7b0..5a4015e4d7 100644
--- a/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.conf.d/10-arch/mkosi.conf
@@ -52,12 +52,3 @@ Packages=
         tgt
         tpm2-tools
         vim
-
-InitrdPackages=
-        btrfs-progs
-        tpm2-tools
-
-InitrdVolatilePackages=
-        systemd
-        systemd-libs
-        systemd-sysvcompat
diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.conf.d/10-centos-fedora/mkosi.conf
index 8882c89b1b..6083fe4f07 100644
--- a/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -59,10 +59,3 @@ Packages=
         util-linux
         veritysetup
         vim-common
-
-InitrdPackages=
-        tpm2-tools
-
-InitrdVolatilePackages=
-        systemd
-        systemd-udev
diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index d282b47fb6..43e078117f 100644
--- a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -75,13 +75,3 @@ Packages=
         tpm2-tools
         tzdata
         xxd
-
-InitrdPackages=
-        btrfs-progs
-        tpm2-tools
-
-InitrdVolatilePackages=
-        systemd
-        systemd-cryptsetup
-        systemd-repart
-        udev
diff --git a/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.conf.d/10-fedora/mkosi.conf
index 92f0c7e9b0..adb7779a1e 100644
--- a/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi.conf.d/10-fedora/mkosi.conf
@@ -23,6 +23,3 @@ Packages=
         rpmautospec
         sbsigntools
         scsi-target-utils
-
-InitrdPackages=
-        btrfs-progs
diff --git a/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst b/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
deleted file mode 100755
index 417132f3dd..0000000000
--- a/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-# OpenSUSE insists on blacklisting erofs by default because its supposedly a legacy filesystem.
-# See https://github.com/openSUSE/suse-module-tools/pull/71
-rm -f "$BUILDROOT/usr/lib/modprobe.d/60-blacklist_fs-erofs.conf"
diff --git a/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.conf.d/10-opensuse/mkosi.conf
index 2a6bd6e7bf..e741aa4a9c 100644
--- a/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -3,9 +3,6 @@
 [Match]
 Distribution=opensuse
 
-[Config]
-InitrdInclude=initrd/
-
 [Distribution]
 Release=tumbleweed
 Repositories=non-oss
@@ -80,13 +77,3 @@ Packages=
         vim
         xz
         zypper
-
-InitrdPackages=
-        btrfs-progs
-        kmod
-        tpm2.0-tools
-
-InitrdVolatilePackages=
-        systemd
-        udev
-        systemd-experimental
-- 
cgit v1.2.3