sys-kernel/dracut: backport regression fix 1322

Signed-off-by: Nowa Ammerlaan <nowa@gentoo.org>
This commit is contained in:
Nowa Ammerlaan
2025-05-18 11:52:02 +02:00
parent 25d44929ee
commit 950d4e63db
2 changed files with 24 additions and 0 deletions

View File

@@ -100,6 +100,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/1322
"${FILESDIR}"/${PN}-107-hostonly-regression-fix-1322.patch
)
pkg_setup() {

View File

@@ -0,0 +1,22 @@
https://github.com/dracut-ng/dracut-ng/pull/1322
diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 840c4fd8a..df362ceff 100755
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -122,11 +122,11 @@ installkernel() {
# if not on strict hostonly mode, install all known filesystems,
# if the required list is not set via the filesystems variable
- if [[ $hostonly_mode != "strict" ]]; then
- if [[ -z $filesystems ]]; then
- dracut_instmods -o -P ".*/(kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd)/.*" '=fs'
- fi
- elif [[ "${host_fs_types[*]}" ]]; then
+ if [[ $hostonly_mode != "strict" ]] && [[ -z $filesystems ]]; then
+ dracut_instmods -o -P ".*/(kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd)/.*" '=fs'
+ fi
+
+ if [[ $hostonly ]] && [[ "${host_fs_types[*]}" ]]; then
hostonly='' instmods "${host_fs_types[@]}"
fi