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 9b784db88224e53a487ac7499f7966c228070454..195e3f5558bd45906c9fe2047d65b75baa2eccc0 100644 (file)
--- 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 a6b717c60ddf8ab0322bc9a2437ec63f398bc920..0f866c6d2d1f284e414201542cdd2fac4f967418 100644 (file)
--- 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"