From eadad31d21118320b11e9008b617780730c424de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Wed, 8 Jun 2022 13:41:05 +0200 Subject: [PATCH] [sys-kernel/dracut] sync with tree --- ...dracut-056.ebuild => dracut-056-r1.ebuild} | 3 +- ...fix-lvm-add-missing-grep-requirement.patch | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) rename sys-kernel/dracut/{dracut-056.ebuild => dracut-056-r1.ebuild} (98%) create mode 100644 sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch diff --git a/sys-kernel/dracut/dracut-056.ebuild b/sys-kernel/dracut/dracut-056-r1.ebuild similarity index 98% rename from sys-kernel/dracut/dracut-056.ebuild rename to sys-kernel/dracut/dracut-056-r1.ebuild index c737458..3a5352f 100644 --- a/sys-kernel/dracut/dracut-056.ebuild +++ b/sys-kernel/dracut/dracut-056-r1.ebuild @@ -62,9 +62,10 @@ BDEPEND=" QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( + "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch "${FILESDIR}"/056-sysctl-vars.patch "${FILESDIR}"/056-musl.patch - "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch + "${FILESDIR}"/056-fix-lvm-add-missing-grep-requirement.patch ) src_configure() { 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 new file mode 100644 index 0000000..ca24180 --- /dev/null +++ b/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch @@ -0,0 +1,36 @@ +From 79f9d9e1c29a9c8fc046ab20765e5bde2aaa3428 Mon Sep 17 00:00:00 2001 +From: Antonio Alvarez Feijoo +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 +