From: Michael Tremer Date: Thu, 27 Nov 2025 11:07:58 +0000 (+0000) Subject: dracut-ng: Move ipfire.conf to 01-ipfire.conf X-Git-Tag: v2.29-core199~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6026963e0f4a0b04ba2b3bc372007e4a2bfefd22;p=ipfire-2.x.git dracut-ng: Move ipfire.conf to 01-ipfire.conf Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/dracut-ng b/config/rootfiles/common/dracut-ng index e8a85c9d4..5a4d59cbe 100644 --- 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 90e6060e6..4b3de27db 100644 --- 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 ecb2828e2..52a4dfced 100644 --- 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)