From patchwork Fri Mar 11 14:43:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5340 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KFTFy6hy3z3xlr for ; Fri, 11 Mar 2022 14:43:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KFTFw0RLbz5WD; Fri, 11 Mar 2022 14:43:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KFTFv3gFHz300b; Fri, 11 Mar 2022 14:43:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KFTFt46vYz2xd1 for ; Fri, 11 Mar 2022 14:43:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KFTFt38Gxz4gy; Fri, 11 Mar 2022 14:43:46 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1647009826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uU4Mhc6l+Tt0V6HisGM5wNJMpgTbsXGW+sAENHegWQk=; b=Yh9GZ1uiwrPzeg6ZYh3Jy2NzvLKzNqOAX55AszVGfeHsd7avEjoA00V66FDVdJ8INCcqU1 YpPiNJCa6KHHhJBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1647009826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uU4Mhc6l+Tt0V6HisGM5wNJMpgTbsXGW+sAENHegWQk=; b=JJcQcQnVS8glyl6pTC2yR3Yh/9GxRNeajEknAwEadeNZDh5pL2bsdTF8tXibEQqvCc6hPq IMa8LUxFM3lBk/9VuBsQPHYKakPMW19rKRGN9eb8NRg5A3sw+nx4IenvAtAJkECBpwwIDN BZTwnKhnjlh/818E4oVSQCqLpkamAQaerj2yE041vGgEt3bAKy58wEYptaXFSs9nZT7I5y 2r+eqYNlTUZJhfxD1mcJVDLDp0HxfdQgaCRzCdkHJ8khtHtyru5vK7kQHQqZbTidLpkbwD p9o6Mp+LdR1G3yU3ockRDVZW/JOk0HhChQIzm8NbuLOqL34V80GKpQbKB3HXOw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/5] dracut: Install an IPFire system configuration file Date: Fri, 11 Mar 2022 14:43:39 +0000 Message-Id: <20220311144341.2642786-3-michael.tremer@ipfire.org> In-Reply-To: <20220311144341.2642786-1-michael.tremer@ipfire.org> References: <20220311144341.2642786-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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 --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)