summaryrefslogtreecommitdiff
path: root/sys-kernel/dracut/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-12-24 02:00:51 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-12-24 02:00:51 +0000
commit4583148f2657a7a66fd68b25c9fab02be110c989 (patch)
treebd7f7afcfa312044a00e9f1207eecdd9802055bc /sys-kernel/dracut/files
parentedb8ee6f86e56d25f82a4f088a4504c903aede08 (diff)
gentoo auto-resync : 24:12:2022 - 02:00:50
Diffstat (limited to 'sys-kernel/dracut/files')
-rw-r--r--sys-kernel/dracut/files/055-add-blockfuncs.patch25
-rw-r--r--sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch32
-rw-r--r--sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch39
-rw-r--r--sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch36
-rw-r--r--sys-kernel/dracut/files/055-tpm2-tss-typo.patch23
-rw-r--r--sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch36
-rw-r--r--sys-kernel/dracut/files/056-musl.patch33
7 files changed, 0 insertions, 224 deletions
diff --git a/sys-kernel/dracut/files/055-add-blockfuncs.patch b/sys-kernel/dracut/files/055-add-blockfuncs.patch
deleted file mode 100644
index 56724e0c73aa..000000000000
--- a/sys-kernel/dracut/files/055-add-blockfuncs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a91dcfeb54b8c6c810020f77124f6eaf6ef5baa9 Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Thu, 12 Aug 2021 11:46:35 +0200
-Subject: [PATCH] fix(kernel-modules): add blk_mq_alloc_disk and
- blk_cleanup_disk to blockfuncs
-
-Since kernel 5-14 those are used by many drivers for example:
-xen-blkfront, loop, nbd, pd
----
- modules.d/90kernel-modules/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
-index 8b06893ae..69dc18b59 100755
---- a/modules.d/90kernel-modules/module-setup.sh
-+++ b/modules.d/90kernel-modules/module-setup.sh
-@@ -2,7 +2,7 @@
-
- # called by dracut
- installkernel() {
-- local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma'
-+ local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma|blk_mq_alloc_disk|blk_cleanup_disk'
- local -A _hostonly_drvs
-
- find_kernel_modules_external() {
diff --git a/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch b/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch
deleted file mode 100644
index 5568c22aede6..000000000000
--- a/sys-kernel/dracut/files/055-fix-base-do-not-quote-initargs-for-switch_root.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 285e2ad01035743ff51005a74e486e09fcbb0a0d Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 23 Jul 2021 14:35:07 -0400
-Subject: [PATCH] fix(base): do not quote $initargs for switch_root
-
-We want word splitting to occur so that the arguments are passed
-separately, and we don't end up passing an empty string if no arguments
-are specified.
-
-Bug: https://bugs.gentoo.org/803548
-Fixes: 2fabaaa62dcfd31e593ca45e1374e55adae29d6b
----
- modules.d/99base/init.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 978adb6f..ab62bb44 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -387,7 +387,8 @@ if [ -f /etc/capsdrop ]; then
- }
- else
- unset RD_DEBUG
-- exec "$SWITCH_ROOT" "$NEWROOT" "$INIT" "$initargs" || {
-+ # shellcheck disable=SC2086
-+ exec "$SWITCH_ROOT" "$NEWROOT" "$INIT" $initargs || {
- warn "Something went very badly wrong in the initramfs. Please "
- warn "file a bug against dracut."
- emergency_shell
---
-2.32.0
-
diff --git a/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch b/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
deleted file mode 100644
index 355cdc461abc..000000000000
--- a/sys-kernel/dracut/files/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e0abf88a15d23fbf793cf872397016ad86aeaaa8 Mon Sep 17 00:00:00 2001
-From: lapseofreason <lapseofreason0@gmail.com>
-Date: Tue, 8 Jun 2021 16:01:58 +0200
-Subject: [PATCH] fix(crypt): remove quotes from cryptsetupopts
-
-Fixes #1528.
----
- modules.d/90crypt/cryptroot-ask.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh
-index 37a4deea..b1f8df81 100755
---- a/modules.d/90crypt/cryptroot-ask.sh
-+++ b/modules.d/90crypt/cryptroot-ask.sh
-@@ -138,8 +138,9 @@ unset allowdiscards
- ask_passphrase=1
-
- if [ -n "$luksfile" -a "$luksfile" != "none" -a -e "$luksfile" ]; then
-+ # shellcheck disable=SC2086
- if readkey "$luksfile" / "$device" \
-- | cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname"; then
-+ | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname"; then
- ask_passphrase=0
- fi
- elif [ "$is_keysource" -ne 0 ]; then
-@@ -164,8 +165,9 @@ else
- unset tmp
-
- info "Using '$keypath' on '$keydev'"
-+ # shellcheck disable=SC2086
- readkey "$keypath" "$keydev" "$device" \
-- | cryptsetup -d - "$cryptsetupopts" luksOpen "$device" "$luksname" \
-+ | cryptsetup -d - $cryptsetupopts luksOpen "$device" "$luksname" \
- && ask_passphrase=0
- unset keypath keydev
- break
---
-2.32.0
-
diff --git a/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch b/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch
deleted file mode 100644
index e46f8bb25db9..000000000000
--- a/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4afdcba212793f136aea012b30dd7bdb5b641a5a Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 16 Aug 2021 18:54:34 +0300
-Subject: [PATCH] fix(usrmount): do not empty _dev variable
-
-Currently $_dev is always overridden with the value returned by
-label_uuid_to_dev(). This results in an empty value if $_dev is a
-device path. Fix this by calling label_uuid_to_dev() conditionally.
-
-Bug: https://bugs.gentoo.org/807971
-Fixes: d3532978de04c78f53664dad7b37705a49a7ee54
----
- modules.d/98usrmount/mount-usr.sh | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index 23ed06aa..c8e1893b 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -55,7 +55,12 @@ mount_usr() {
- while read -r _dev _mp _fs _opts _freq _passno || [ -n "$_dev" ]; do
- [ "${_dev%%#*}" != "$_dev" ] && continue
- if [ "$_mp" = "/usr" ]; then
-- _dev="$(label_uuid_to_dev "$_dev")"
-+ case "$_dev" in
-+ LABEL=* | UUID=* | PARTUUID=* | PARTLABEL=*)
-+ _dev="$(label_uuid_to_dev "$_dev")"
-+ ;;
-+ *) ;;
-+ esac
-
- if strstr "$_opts" "subvol=" \
- && [ "${root#block:}" -ef "$_dev" ] \
---
-2.31.1
-
diff --git a/sys-kernel/dracut/files/055-tpm2-tss-typo.patch b/sys-kernel/dracut/files/055-tpm2-tss-typo.patch
deleted file mode 100644
index a04496a29ca8..000000000000
--- a/sys-kernel/dracut/files/055-tpm2-tss-typo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8b17105bed69ed90582a13d97d95ee19e6581365 Mon Sep 17 00:00:00 2001
-From: Matthias Berndt <matthias_berndt@gmx.de>
-Date: Tue, 1 Jun 2021 19:32:48 +0200
-Subject: [PATCH] fix(tpm2-tss): typo in depends()
-
-There is no systemd-udev module, only systemd-udevd
----
- modules.d/91tpm2-tss/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh
-index 28af22a31..361131d66 100755
---- a/modules.d/91tpm2-tss/module-setup.sh
-+++ b/modules.d/91tpm2-tss/module-setup.sh
-@@ -17,7 +17,7 @@ check() {
- depends() {
-
- # This module has external dependency on other module(s).
-- echo systemd-sysusers systemd-udev
-+ echo systemd-sysusers systemd-udevd
- # Return 0 to include the dependent module(s) in the initramfs.
- return 0
-
diff --git a/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch b/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch
deleted file mode 100644
index ca24180fd689..000000000000
--- a/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 79f9d9e1c29a9c8fc046ab20765e5bde2aaa3428 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 11 Apr 2022 08:33:17 +0200
-Subject: [PATCH] fix(lvm): add missing grep requirement
-
-Since commit https://github.com/dracutdevs/dracut/commit/7ffc5e38
-lvm_scan.sh needs grep.
----
- modules.d/90lvm/module-setup.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index 25be0133..aa8c6db8 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -3,7 +3,7 @@
- # called by dracut
- check() {
- # No point trying to support lvm if the binaries are missing
-- require_binaries lvm || return 1
-+ require_binaries lvm grep || return 1
-
- [[ $hostonly ]] || [[ $mount_needs ]] && {
- for fs in "${host_fs_types[@]}"; do
-@@ -48,7 +48,7 @@ installkernel() {
-
- # called by dracut
- install() {
-- inst lvm
-+ inst_multiple lvm grep
-
- if [[ $hostonly_cmdline == "yes" ]]; then
- local _lvmconf
---
-2.35.1
-
diff --git a/sys-kernel/dracut/files/056-musl.patch b/sys-kernel/dracut/files/056-musl.patch
deleted file mode 100644
index ded188889755..000000000000
--- a/sys-kernel/dracut/files/056-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ce55a85ed5d902c19d75895508856f96ec2ceb1a Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sun, 20 Feb 2022 22:23:49 -0500
-Subject: [PATCH] fix(install): restore musl support
-
-__GLIBC_PREREQ is only defined in glibc.
----
- src/install/util.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/install/util.c b/src/install/util.c
-index 5721de89e..0af387c27 100644
---- a/src/install/util.c
-+++ b/src/install/util.c
-@@ -24,17 +24,15 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/types.h>
-+#include <sys/syscall.h>
-
- #include "util.h"
-
--#if __GLIBC_PREREQ(2, 30) == 0
--#include <sys/syscall.h>
- #ifndef SYS_gettid
- #error "SYS_gettid unavailable on this system"
- #endif
-
- #define gettid() ((pid_t) syscall(SYS_gettid))
--#endif /*__GLIBC_PREREQ */
-
- size_t page_size(void)
- {