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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CAEF15800D for ; Wed, 5 Jul 2023 06:19:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE63CE0843; Wed, 5 Jul 2023 06:19:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C68D1E0843 for ; Wed, 5 Jul 2023 06:19:15 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 001C134108A for ; Wed, 5 Jul 2023 06:19:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76968A99 for ; Wed, 5 Jul 2023 06:19:13 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1688537944.7f54de2508fd57a8f31b5dc61b970448ab22c20d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/dist-kernel-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7f54de2508fd57a8f31b5dc61b970448ab22c20d X-VCS-Branch: master Date: Wed, 5 Jul 2023 06:19:13 +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: 8b251d25-887c-42bd-a4cf-ec8bbe19c979 X-Archives-Hash: 7e303082513598c93678f94a7765e9ce commit: 7f54de2508fd57a8f31b5dc61b970448ab22c20d Author: Chris Pritchard christopherpritchard co uk> AuthorDate: Tue Jul 4 23:01:24 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jul 5 06:19:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f54de25 dist-kernel-utils.eclass: fix user script overrides Closes: https://bugs.gentoo.org/909538 Signed-off-by: Chris Pritchard christopherpritchard.co.uk> Closes: https://github.com/gentoo/gentoo/pull/31745 Signed-off-by: Michał Górny gentoo.org> eclass/dist-kernel-utils.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index cfb6f40ac6fa..1ef3104245c6 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -110,14 +110,14 @@ dist-kernel_install_kernel() { # https://github.com/dracutdevs/dracut/pull/2405 shopt -s nullglob local plugins=() + for file in "${EROOT}"/etc/kernel/install.d/*.install; do + plugins+=( "${file}" ) + done for file in "${EROOT}"/usr/lib/kernel/install.d/*.install; do - if ! has "${file##*/}" 50-dracut.install 51-dracut-rescue.install; then + if ! has "${file##*/}" 50-dracut.install 51-dracut-rescue.install "${plugins[@]##*/}"; then plugins+=( "${file}" ) fi done - for file in "${EROOT}"/etc/kernel/install.d/*.install; do - plugins+=( "${file}" ) - done shopt -u nullglob export KERNEL_INSTALL_PLUGINS="${KERNEL_INSTALL_PLUGINS} ${plugins[@]}" fi