From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 74C321582EF for ; Sun, 09 Feb 2025 09:30:10 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 60FAB343056 for ; Sun, 09 Feb 2025 09:30:10 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 640421103CB; Sun, 09 Feb 2025 09:30:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 5A0E41103CB for ; Sun, 09 Feb 2025 09:30:09 +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 1478C343056 for ; Sun, 09 Feb 2025 09:30:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BACA13CF for ; Sun, 09 Feb 2025 09:30:07 +0000 (UTC) From: "Nowa Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nowa Ammerlaan" Message-ID: <1739093325.16b99973c2a642983deb9d9f0d8d10c64e18a8d2.nowa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-106-r1.ebuild sys-kernel/dracut/dracut-106.ebuild sys-kernel/dracut/files/dracut-106-fix-rngd-module.patch X-VCS-Directories: sys-kernel/dracut/ sys-kernel/dracut/files/ X-VCS-Committer: nowa X-VCS-Committer-Name: Nowa Ammerlaan X-VCS-Revision: 16b99973c2a642983deb9d9f0d8d10c64e18a8d2 X-VCS-Branch: master Date: Sun, 09 Feb 2025 09:30:07 +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: 956e5a8b-8937-4e11-9abc-5fa107c210d9 X-Archives-Hash: 3715b80ed8e1796bcd7cfbdd94d014a9 commit: 16b99973c2a642983deb9d9f0d8d10c64e18a8d2 Author: Nowa Ammerlaan gentoo org> AuthorDate: Sun Feb 9 09:28:35 2025 +0000 Commit: Nowa Ammerlaan gentoo org> CommitDate: Sun Feb 9 09:28:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b99973 sys-kernel/dracut: backport rngd fix Signed-off-by: Nowa Ammerlaan gentoo.org> .../dracut/{dracut-106.ebuild => dracut-106-r1.ebuild} | 2 ++ sys-kernel/dracut/files/dracut-106-fix-rngd-module.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/sys-kernel/dracut/dracut-106.ebuild b/sys-kernel/dracut/dracut-106-r1.ebuild similarity index 98% rename from sys-kernel/dracut/dracut-106.ebuild rename to sys-kernel/dracut/dracut-106-r1.ebuild index d4781eb67c6b..8dfb986ced53 100644 --- a/sys-kernel/dracut/dracut-106.ebuild +++ b/sys-kernel/dracut/dracut-106-r1.ebuild @@ -101,6 +101,8 @@ PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch # Gentoo specific acct-user and acct-group conf adjustments "${FILESDIR}"/${PN}-106-acct-user-group-gentoo.patch + # https://github.com/dracut-ng/dracut-ng/pull/1207 + "${FILESDIR}"/${PN}-106-fix-rngd-module.patch ) pkg_setup() { diff --git a/sys-kernel/dracut/files/dracut-106-fix-rngd-module.patch b/sys-kernel/dracut/files/dracut-106-fix-rngd-module.patch new file mode 100644 index 000000000000..8163ba28ad7d --- /dev/null +++ b/sys-kernel/dracut/files/dracut-106-fix-rngd-module.patch @@ -0,0 +1,14 @@ +https://github.com/dracut-ng/dracut-ng/pull/1207 +diff --git a/modules.d/06rngd/module-setup.sh b/modules.d/06rngd/module-setup.sh +index 1fcc831c4..064379242 100755 +--- a/modules.d/06rngd/module-setup.sh ++++ b/modules.d/06rngd/module-setup.sh +@@ -21,7 +21,7 @@ + check() { + # if there's no rngd binary, no go. + require_binaries rngd || return 1 +- require_binaries "${systemdsystemunitdir}/rngd.service" || return 1 ++ [[ -e "${systemdsystemunitdir}/rngd.service" ]] || return 1 + + return 0 + }