dracut-ng: Move ipfire.conf to 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 e8a85c9d48d088d5ef359c147e42a16601dd0837..5a4d59cbe0f6b39ee2cc9b4892db6f318d49c273 100644 (file)
--- a/config/rootfiles/common/dracut-ng
+++ b/config/rootfiles/common/dracut-ng
@@ -13,6 +13,7 @@ usr/lib/dracut/dracut-logger.sh
 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
@@ -22,7 +23,6 @@ usr/lib/dracut/dracut.conf.d
 #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/ipfire.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

diff --git a/config/rootfiles/core/199/update.sh b/config/rootfiles/core/199/update.sh
index 90e6060e6b6120d38bb952c570a160282038da25..4b3de27db3799abdd959e5a0f8215a3ba5078b49 100644 (file)
--- a/config/rootfiles/core/199/update.sh
+++ b/config/rootfiles/core/199/update.sh
@@ -101,7 +101,8 @@ done
 
 # Remove files
 rm -rfv \
-       /lib/udev
+       /lib/udev \
+       /usr/lib/dracut/dracut.conf.d/ipfire.conf
 
 # Create the messagebus group
 if ! getent group messagebus >/dev/null; then

diff --git a/lfs/dracut-ng b/lfs/dracut-ng
index ecb2828e2b061e86cdac2dbd1ef05e0819a35601..52a4dfced44b8a61a966f92328657b4782ecb679 100644 (file)
--- a/lfs/dracut-ng
+++ b/lfs/dracut-ng
@@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                sysconfdir=/etc
 
        cp -vf $(DIR_SRC)/config/dracut/ipfire.conf \
-               /usr/lib/dracut/dracut.conf.d/ipfire.conf
+               /usr/lib/dracut/dracut.conf.d/01-ipfire.conf
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)