commit: 7f54de2508fd57a8f31b5dc61b970448ab22c20d Author: Chris Pritchard <chris <AT> christopherpritchard <DOT> co <DOT> uk> AuthorDate: Tue Jul 4 23:01:24 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> 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 <chris <AT> christopherpritchard.co.uk> Closes: https://github.com/gentoo/gentoo/pull/31745 Signed-off-by: Michał Górny <mgorny <AT> 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
