diff mbox series

[3/5] dracut: Install an IPFire system configuration file

Message ID 20220311144341.2642786-3-michael.tremer@ipfire.org
State Accepted
Commit d8db858769bc92178678e459e84c312e26328fd1
Headers
Series [1/5] dracut: Update to 056 |

Commit Message

Michael Tremer March 11, 2022, 2:43 p.m. UTC 
  This file contains our custom settings:

* Always load microcodes as early as possible

* We now compress the initrd using Zstandard which is substanstically
  faster than XZ, but offers better compression ratios

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/dracut/dracut.conf      | 57 ----------------------------------
 config/dracut/ipfire.conf      |  5 +++
 config/rootfiles/common/dracut |  1 +
 lfs/dracut                     |  3 +-
 4 files changed, 8 insertions(+), 58 deletions(-)
 delete mode 100644 config/dracut/dracut.conf
 create mode 100644 config/dracut/ipfire.conf
diff mbox series

Patch

diff --git a/config/dracut/dracut.conf b/config/dracut/dracut.conf
deleted file mode 100644
index 74736352e..000000000
--- a/config/dracut/dracut.conf
+++ /dev/null
@@ -1,57 +0,0 @@ 
-# PUT YOUR CONFIG HERE OR IN separate files named *.conf
-# in /etc/dracut.conf.d
-# SEE man dracut.conf(5)
-
-# Sample dracut config file
-
-#logfile=/var/log/dracut.log
-#fileloglvl=6
-
-# Exact list of dracut modules to use.  Modules not listed here are not going
-# to be included.  If you only want to add some optional modules use
-# add_dracutmodules option instead.
-#dracutmodules+=""
-
-# dracut modules to omit
-#omit_dracutmodules+=""
-
-# dracut modules to add to the default
-#add_dracutmodules+=""
-
-# additional kernel modules to the default
-add_drivers+="xen_blkfront"
-
-# skip kernel modules (marvell sdio and compat from backports)
-omit_drivers+="libertas libertas_sdio mwifiex mwifiex_sdio compat"
-
-# list of kernel filesystem modules to be included in the generic initramfs
-filesystems+="reiserfs vfat xfs"
-
-# build initrd only to boot current hardware
-#hostonly="yes"
-#
-
-# Load microcode for the CPU early
-early_microcode=yes
-
-# install local /etc/mdadm.conf
-#mdadmconf="no"
-
-# install local /etc/lvm/lvm.conf
-#lvmconf="no"
-
-# A list of fsck tools to install. If it's not specified, module's hardcoded
-# default is used, currently: "umount mount /sbin/fsck* xfs_db xfs_check
-# xfs_repair e2fsck jfs_fsck reiserfsck btrfsck". The installation is
-# opportunistic, so non-existing tools are just ignored.
-#fscks=""
-
-# inhibit installation of any fsck tools
-#nofscks="yes"
-
-# mount / and /usr read-only by default
-#ro_mnt="no"
-
-# set the directory for temporary files
-# default: /var/tmp
-#tmpdir=/tmp
diff --git a/config/dracut/ipfire.conf b/config/dracut/ipfire.conf
new file mode 100644
index 000000000..bab5c8a2e
--- /dev/null
+++ b/config/dracut/ipfire.conf
@@ -0,0 +1,5 @@ 
+# Load microcode for the CPU early
+early_microcode="yes"
+
+# Compress using Zstandard
+compress="zstd"
diff --git a/config/rootfiles/common/dracut b/config/rootfiles/common/dracut
index 3143f49c3..d172898ee 100644
--- a/config/rootfiles/common/dracut
+++ b/config/rootfiles/common/dracut
@@ -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/ipfire.conf
 #usr/lib/dracut/modules.d
 usr/lib/dracut/modules.d/00bash
 usr/lib/dracut/modules.d/00bash/module-setup.sh
diff --git a/lfs/dracut b/lfs/dracut
index 26c0c0cf6..426869d20 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -74,7 +74,8 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc
 
-	cp -vf $(DIR_SRC)/config/dracut/dracut.conf /etc/dracut.conf
+	cp -vf $(DIR_SRC)/config/dracut/ipfire.conf \
+		/usr/lib/dracut/dracut.conf.d/ipfire.conf
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)