From c32f6d20d23a829c58d07929e6a2cc5cd6e9e0f7 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Sun, 2 Jun 2024 17:00:13 +0300
Subject: [PATCH] dracut: resolve the dependency issue of network module by
 omitting the three others as well

---
 etc/dracut.conf.d/README.md                | 21 ---------------------
 etc/dracut.conf.d/omit_modules.conf        |  2 +-
 etc/dracut.conf.d/omit_modules.conf.sedric |  2 +-
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/etc/dracut.conf.d/README.md b/etc/dracut.conf.d/README.md
index 90a08d96..10882bd0 100644
--- a/etc/dracut.conf.d/README.md
+++ b/etc/dracut.conf.d/README.md
@@ -8,7 +8,6 @@ My dracut configuration files mainly for generating unified kerneil images
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 - [WARNING!](#warning)
-  - [network](#network)
   - [hostonly](#hostonly)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -24,26 +23,6 @@ go through what of it is actually useful and worth keeping around and at least
 disabling recovery seems dangerous if I can save space by omitting somnething
 else.
 
-## network
-
-```
-dracut[E]: Module 'cifs' depends on 'network', which can't be installed
-dracut[E]: Module 'iscsi' depends on 'network', which can't be installed
-dracut[E]: Module 'nvmf' depends on 'network', which can't be installed
-```
-
-I think nvmf might be relevant on ThinkPads, so it gets out of `omit_modules`
-
-At least it resolves these two…
-
-<code style="color: red">
-Error registering initrd: Already started
-Error starting kernel image: Already started
-</code>
-
-…which cause fallback to the next UEFI boot entry (why is that grub still
-around?)
-
 ## hostonly
 
 Will make a UKI specific to the current hardware and is discouraged as it will
diff --git a/etc/dracut.conf.d/omit_modules.conf b/etc/dracut.conf.d/omit_modules.conf
index 90bc82fe..83a37e93 100644
--- a/etc/dracut.conf.d/omit_modules.conf
+++ b/etc/dracut.conf.d/omit_modules.conf
@@ -1 +1 @@
-omit_dracutmodules+=" plymouth kernel-modules-extra network-manager network-legacy connman systemd-networkd i18n net-lib kernel-network-modules qemu qemu-net kernel-modules-asahi nfs asahi-firmware "
+omit_dracutmodules+=" plymouth kernel-modules-extra network-manager network-legacy connman systemd-networkd i18n net-lib kernel-network-modules qemu qemu-net kernel-modules-asahi nfs asahi-firmware network cifs iscsi nvmf "
diff --git a/etc/dracut.conf.d/omit_modules.conf.sedric b/etc/dracut.conf.d/omit_modules.conf.sedric
index 086d6882..7b221c81 100644
--- a/etc/dracut.conf.d/omit_modules.conf.sedric
+++ b/etc/dracut.conf.d/omit_modules.conf.sedric
@@ -1 +1 @@
-omit_dracutmodules+=" plymouth tpm2-tss kernel-modules-extra network-manager network-legacy connman systemd-networkd i18n network net-lib kernel-network-modules qemu qemu-net kernel-modules-asahi nfs asahi-firmware "
+omit_dracutmodules+=" plymouth tpm2-tss kernel-modules-extra network-manager network-legacy connman systemd-networkd i18n network net-lib kernel-network-modules qemu qemu-net kernel-modules-asahi nfs asahi-firmware network cifs iscsi nvmf "