From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 27 Nov 2025 11:09:58 +0000 (+0000)
Subject: dracut-ng: Remove default configuration
X-Git-Tag: v2.29-core199~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9457019809d8aa7dc1731a73e5edb131ce383026;p=ipfire-2.x.git

dracut-ng: Remove default configuration

We don't need to install any example/default configuration as we are
controlling our own configruation in 01-ipfire.conf.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/dracut-ng b/config/rootfiles/common/dracut-ng
index 5a4d59cbe..3b492651c 100644
--- a/config/rootfiles/common/dracut-ng
+++ b/config/rootfiles/common/dracut-ng
@@ -14,23 +14,6 @@ usr/lib/dracut/dracut-util
 usr/lib/dracut/dracut-version.sh
 usr/lib/dracut/dracut.conf.d
 usr/lib/dracut/dracut.conf.d/01-ipfire.conf
-#usr/lib/dracut/dracut.conf.d/10-hostonly.conf
-#usr/lib/dracut/dracut.conf.d/fips
-#usr/lib/dracut/dracut.conf.d/fips/10-fips.conf
-#usr/lib/dracut/dracut.conf.d/generic
-#usr/lib/dracut/dracut.conf.d/generic/11-generic.conf
-#usr/lib/dracut/dracut.conf.d/hostonly
-#usr/lib/dracut/dracut.conf.d/hostonly/10-hostonly.conf
-#usr/lib/dracut/dracut.conf.d/ima
-#usr/lib/dracut/dracut.conf.d/ima/10-ima.conf
-#usr/lib/dracut/dracut.conf.d/no-network
-#usr/lib/dracut/dracut.conf.d/no-network/10-no-network.conf
-#usr/lib/dracut/dracut.conf.d/no-xattr
-#usr/lib/dracut/dracut.conf.d/no-xattr/10-no-xattr.conf
-#usr/lib/dracut/dracut.conf.d/rescue
-#usr/lib/dracut/dracut.conf.d/rescue/10-rescue.conf
-#usr/lib/dracut/dracut.conf.d/uki-virt
-#usr/lib/dracut/dracut.conf.d/uki-virt/10-uki-virt.conf
 #usr/lib/dracut/modules.d
 usr/lib/dracut/modules.d/10bash
 usr/lib/dracut/modules.d/10bash/module-setup.sh
diff --git a/config/rootfiles/core/199/update.sh b/config/rootfiles/core/199/update.sh
index 4b3de27db..933cdd6bc 100644
--- a/config/rootfiles/core/199/update.sh
+++ b/config/rootfiles/core/199/update.sh
@@ -102,7 +102,7 @@ done
 # Remove files
 rm -rfv \
 	/lib/udev \
-	/usr/lib/dracut/dracut.conf.d/ipfire.conf
+	/usr/lib/dracut/dracut.conf.d
 
 # Create the messagebus group
 if ! getent group messagebus >/dev/null; then
diff --git a/lfs/dracut-ng b/lfs/dracut-ng
index 52a4dfced..68c26adb7 100644
--- a/lfs/dracut-ng
+++ b/lfs/dracut-ng
@@ -81,6 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 				sbindir=/sbin \
 				sysconfdir=/etc
 
+	# Remove any default configuration
+	rm -rvf /usr/lib/dracut/dracut.conf.d/*
+
+	# Install the IPFire configuration
 	cp -vf $(DIR_SRC)/config/dracut/ipfire.conf \
 		/usr/lib/dracut/dracut.conf.d/01-ipfire.conf