dracut: update to 051.

This commit is contained in:
Đoàn Trần Công Danh 2021-01-24 16:32:38 +07:00
parent 72ee8af951
commit a696d4b8e3
7 changed files with 18 additions and 196 deletions

View file

@ -1,39 +0,0 @@
From 2edc52848eaf2331cdcce64f92d8e76947c01a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 14 Mar 2020 11:44:47 +0700
Subject: [PATCH] cryptroot-ask: no warn if /run/cryptsetup exist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In either case:
- encrypted device is decrypted, udev will trigger device changes again,
- multiple encrypted device,
cryptroot-ask will run multiple time, then report:
> mkdir: cannot create directory '/run/cryptsetup': File exists
Pass `-p` into mkdir to ignore that warning.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
modules.d/90crypt/cryptroot-ask.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git modules.d/90crypt/cryptroot-ask.sh modules.d/90crypt/cryptroot-ask.sh
index e1f17975..97047ae9 100755
--- modules.d/90crypt/cryptroot-ask.sh
+++ modules.d/90crypt/cryptroot-ask.sh
@@ -8,7 +8,7 @@ NEWROOT=${NEWROOT:-"/sysroot"}
. /lib/dracut-lib.sh
-mkdir -m 0700 /run/cryptsetup
+mkdir -p -m 0700 /run/cryptsetup
# if device name is /dev/dm-X, convert to /dev/mapper/name
if [ "${1##/dev/dm-}" != "$1" ]; then
--
2.26.0.rc1.191.g7acaab7404

View file

@ -0,0 +1,13 @@
diff --git modules.d/99squash/module-setup.sh modules.d/99squash/module-setup.sh
index 9a61a59d..96543a58 100644
--- modules.d/99squash/module-setup.sh
+++ modules.d/99squash/module-setup.sh
@@ -2,8 +2,7 @@
check() {
if ! dracut_module_included "systemd-initrd"; then
- derror "dracut-squash only supports systemd bases initramfs"
return 1
fi
if ! type -P mksquashfs >/dev/null || ! type -P unsquashfs >/dev/null ; then

View file

@ -1,32 +0,0 @@
From 0e6859c98a90a1b44abc6f29ba64628afc1be7cb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jul 2020 17:29:23 +0200
Subject: [PATCH 3/4] mkinitrd-dracut.sh: use vmlinux regex for ppc*, vmlinuz
for i686
Previously this would not catch ppc64le, now it does; same with
i686.
---
mkinitrd-dracut.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git mkinitrd-dracut.sh mkinitrd-dracut.sh
index 82d90684..1ea3e514 100755
--- mkinitrd-dracut.sh
+++ mkinitrd-dracut.sh
@@ -57,10 +57,10 @@ default_kernel_images() {
s390|s390x)
regex='image'
;;
- ppc|ppc64)
+ ppc*)
regex='vmlinux'
;;
- i386|x86_64)
+ i*86|x86_64)
regex='vmlinuz'
;;
arm*)
--
2.27.0

View file

@ -1,57 +0,0 @@
From d690d736a71e18711b94098da24f56b392c7e6f7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jul 2020 17:28:16 +0200
Subject: [PATCH 2/4] dracut.sh: fix early microcode detection logic
This fixes two issues:
1) on non-x86 systems in non-hostonly config this would cause
an annoying warning on every initramfs generation
2) on non-x86 systems in hostonly config this would result in
early microcode not getting disabled
---
dracut.sh | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git dracut.sh dracut.sh
index 58ff24d1..cd3fcbe2 100755
--- dracut.sh
+++ dracut.sh
@@ -1194,19 +1194,26 @@ fi
if [[ $early_microcode = yes ]]; then
if [[ $hostonly ]]; then
- [[ $(get_cpu_vendor) == "AMD" ]] \
- && ! check_kernel_config CONFIG_MICROCODE_AMD \
- && unset early_microcode
- [[ $(get_cpu_vendor) == "Intel" ]] \
- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
- && unset early_microcode
+ if [[ $(get_cpu_vendor) == "AMD" ]]; then
+ check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
+ elif [[ $(get_cpu_vendor) == "Intel" ]]; then
+ check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
+ else
+ unset early_microcode
+ fi
else
! check_kernel_config CONFIG_MICROCODE_AMD \
&& ! check_kernel_config CONFIG_MICROCODE_INTEL \
&& unset early_microcode
fi
- [[ $early_microcode != yes ]] \
- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
+ # Do not complain on non-x86 architectures as it makes no sense
+ case $(uname -m) in
+ x86_64|i*86)
+ [[ $early_microcode != yes ]] \
+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
+ ;;
+ *) ;;
+ esac
fi
# Need to be able to have non-root users read stuff (rpcbind etc)
--
2.27.0

View file

@ -1,25 +0,0 @@
From e1bce654f1bd739cf1f975ff0a1f766221c3d4ee Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jul 2020 17:20:40 +0200
Subject: [PATCH 1/4] dracut.sh: fix ia32 detection for uefi executables
---
dracut.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git dracut.sh dracut.sh
index e3195499..58ff24d1 100755
--- dracut.sh
+++ dracut.sh
@@ -1153,7 +1153,7 @@ if [[ ! $print_cmdline ]]; then
case $(uname -m) in
x86_64)
EFI_MACHINE_TYPE_NAME=x64;;
- ia32)
+ i*86)
EFI_MACHINE_TYPE_NAME=ia32;;
*)
dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"
--
2.27.0

View file

@ -1,37 +0,0 @@
From c26b5c7559c297aaa6c78787fa8de18bbf090205 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 25 Jul 2020 17:47:00 +0200
Subject: [PATCH 4/4] 90ppcmac: respect DRACUT_ARCH, don't exclude ppcle
---
modules.d/90ppcmac/module-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git modules.d/90ppcmac/module-setup.sh modules.d/90ppcmac/module-setup.sh
index 59221ec4..7199dd9b 100644
--- modules.d/90ppcmac/module-setup.sh
+++ modules.d/90ppcmac/module-setup.sh
@@ -17,9 +17,9 @@
# called by dracut
check() {
- local _arch="$(uname -m)"
+ local _arch=${DRACUT_ARCH:-$(uname -m)}
# only for PowerPC Macs
- [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
+ [[ "$_arch" == ppc* && "$_arch" != ppc64le ]] || return 1
return 0
}
@@ -36,7 +36,7 @@ installkernel() {
}
# only PowerMac3,6 has a module, special case
- if [[ "$(uname -m)" == ppc ]]; then
+ if [[ "${DRACUT_ARCH:-$(uname -m)}" != ppc64* ]]; then
if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
instmods therm_windtunnel
fi
--
2.27.0

View file

@ -1,20 +1,19 @@
# Template file for 'dracut' # Template file for 'dracut'
pkgname=dracut pkgname=dracut
version=050 version=051
revision=10 revision=1
build_style=configure build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc" configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf" conf_files="/etc/dracut.conf"
# XXX: docbook-xml was added to sort builders out, can be removed hostmakedepends="pkg-config"
hostmakedepends="asciidoc docbook-xml pkg-config"
makedepends="libkmod-devel" makedepends="libkmod-devel"
depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux" depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image" short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="q66 <daniel@octaforge.org>" maintainer="q66 <daniel@octaforge.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later" license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html" homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz" distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz"
checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333 checksum=95bc2586b771e3f4ab5c8637201732a137bb682395d25ab496374241091906e3
subpackages="dracut-network" subpackages="dracut-network"
make_dirs=" make_dirs="