From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 30 Dec 2022 18:10:06 +0000 (+0000)
Subject: dracut: Implement some reasonable defaults
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd380882e9fd3debdc049412146467b6e239de95;p=ipfire-3.x.git

dracut: Implement some reasonable defaults

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

diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index 9b784db88..195e3f555 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -5,7 +5,7 @@
 
 name       = dracut
 version    = 048
-release    = 7
+release    = 8
 
 groups     = System/Boot
 url        = http://sourceforge.net/apps/trac/dracut/wiki
@@ -64,8 +64,9 @@ build
 			%{BUILDROOT}%{dracutlibdir}/modules.d/95znet
 
 		# Install local configuration
-		mkdir -pv %{BUILDROOT}/etc/dracut.conf.d
-		cp -vf %{DIR_SOURCE}/ipfire.conf %{BUILDROOT}/etc/dracut.conf.d/ipfire.conf
+		mkdir -pv %{BUILDROOT}%{dracutlibdir}/dracut.conf.d
+		install -v -m 644 %{DIR_SOURCE}/ipfire.conf \
+			%{BUILDROOT}%{dracutlibdir}/dracut.conf.d/ipfire.conf
 
 		# Save package version
 		mkdir -pv %{BUILDROOT}/%{dracutlibdir}/dracut
@@ -106,6 +107,7 @@ packages
 			udev
 			util-linux
 			which
+			zstd
 		end
 	end
 
diff --git a/dracut/ipfire.conf b/dracut/ipfire.conf
index a6b717c60..0f866c6d2 100644
--- a/dracut/ipfire.conf
+++ b/dracut/ipfire.conf
@@ -1,13 +1,7 @@
-# Dracut config file customized for IPFire.
+# Dracut config file customized for IPFire
 
-# i18n
-i18n_vars="/etc/vconsole.conf:KEYTABLE-KEYMAP,SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
-#add_dracutmodules+=" "
-stdloglvl=3
-prefix="/"
-systemdutildir=/usr/lib/systemd
-systemdsystemunitdir=/usr/lib/systemd/system
-udevdir=/usr/lib/udev
-add_dracutmodules+=" systemd "
-realinitpath="/usr/lib/systemd/systemd"
-kernel_cmdline+=" rd.auto=1 "
+# Load microcode for the CPU early
+early_microcode="yes"
+
+# Compress using Zstandard
+compress="zstd"