From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A13C4158042 for ; Sun, 10 Nov 2024 02:21:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4925E0980; Sun, 10 Nov 2024 02:21:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C87EDE0980 for ; Sun, 10 Nov 2024 02:21:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF98733BE26 for ; Sun, 10 Nov 2024 02:21:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 326EA1AB4 for ; Sun, 10 Nov 2024 02:21:50 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1731205304.0ba84bd28de65a8eef652f159dec0df0a40be462.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-105-r2.ebuild sys-kernel/dracut/dracut-105-r3.ebuild sys-kernel/dracut/files/dracut-105-systemd-cryptsetup.patch X-VCS-Directories: sys-kernel/dracut/ sys-kernel/dracut/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 0ba84bd28de65a8eef652f159dec0df0a40be462 X-VCS-Branch: master Date: Sun, 10 Nov 2024 02:21:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b5efc97e-c71c-4b39-95fe-f6cb5f74b57f X-Archives-Hash: 03ea17cc892147ea7b85d312ba3d895c commit: 0ba84bd28de65a8eef652f159dec0df0a40be462 Author: Mike Gilbert gentoo org> AuthorDate: Sun Nov 10 02:20:34 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Nov 10 02:21:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba84bd2 sys-kernel/dracut: backport fix for cryptsetup Closes: https://bugs.gentoo.org/943035 Signed-off-by: Mike Gilbert gentoo.org> .../{dracut-105-r2.ebuild => dracut-105-r3.ebuild} | 2 ++ .../files/dracut-105-systemd-cryptsetup.patch | 29 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/sys-kernel/dracut/dracut-105-r2.ebuild b/sys-kernel/dracut/dracut-105-r3.ebuild similarity index 98% rename from sys-kernel/dracut/dracut-105-r2.ebuild rename to sys-kernel/dracut/dracut-105-r3.ebuild index 743a246869b9..fc035356162f 100644 --- a/sys-kernel/dracut/dracut-105-r2.ebuild +++ b/sys-kernel/dracut/dracut-105-r3.ebuild @@ -103,6 +103,8 @@ PATCHES=( "${FILESDIR}"/${PN}-105-ensure-abs-args-for-objcopy.patch # https://github.com/dracut-ng/dracut-ng/pull/904 "${FILESDIR}"/${PN}-105-fix-check_kernel_module.patch + # https://github.com/dracut-ng/dracut-ng/pull/921 + "${FILESDIR}"/dracut-105-systemd-cryptsetup.patch ) src_configure() { diff --git a/sys-kernel/dracut/files/dracut-105-systemd-cryptsetup.patch b/sys-kernel/dracut/files/dracut-105-systemd-cryptsetup.patch new file mode 100644 index 000000000000..154bd21ca13c --- /dev/null +++ b/sys-kernel/dracut/files/dracut-105-systemd-cryptsetup.patch @@ -0,0 +1,29 @@ +https://github.com/dracut-ng/dracut-ng/pull/921 +https://bugs.gentoo.org/943035 + +From 2d4b550c71cc79ac7a3f18afc09d8263963d5de2 Mon Sep 17 00:00:00 2001 +From: Jo Zzsi +Date: Sat, 9 Nov 2024 14:06:57 -0500 +Subject: [PATCH] fix(dracut-systemd): check systemd-cryptsetup before + including + +--- + modules.d/98dracut-systemd/module-setup.sh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/modules.d/98dracut-systemd/module-setup.sh b/modules.d/98dracut-systemd/module-setup.sh +index 0438e40f0..f2502cd78 100755 +--- a/modules.d/98dracut-systemd/module-setup.sh ++++ b/modules.d/98dracut-systemd/module-setup.sh +@@ -19,7 +19,10 @@ depends() { + # systemd-cryptsetup is mandatory dependency + # see https://github.com/dracut-ng/dracut-ng/issues/563 + if dracut_module_included "crypt"; then +- deps+=" systemd-cryptsetup" ++ module_check systemd-cryptsetup > /dev/null 2>&1 ++ if [[ $? == 255 ]]; then ++ deps+=" systemd-cryptsetup" ++ fi + fi + + echo "$deps"