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 5a4d59cbe0f6b39ee2cc9b4892db6f318d49c273..3b492651c92df0499a1e386c93ef7e9d4cda5f08 100644 (file)
--- 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 4b3de27db3799abdd959e5a0f8215a3ba5078b49..933cdd6bc1feade82e4726b80c9538673a364e55 100644 (file)
--- 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 52a4dfced44b8a61a966f92328657b4782ecb679..68c26adb7c284dabe442ff465a77ab25b471ce45 100644 (file)
--- 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