|
 |
a4bf14 |
From 9b2497dffb8f699ce040cdbafa967f5fe02b57b6 Mon Sep 17 00:00:00 2001
|
|
|
a4bf14 |
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
|
a4bf14 |
Date: Fri, 2 Aug 2019 14:26:23 +0200
|
|
|
a4bf14 |
Subject: [PATCH] 90kernel-modules-extra: don't resolve symlinks before instmod
|
|
|
a4bf14 |
|
|
|
a4bf14 |
When you install a third-party driver, you will probably end in a
|
|
|
a4bf14 |
situation, where the module will be in a different directory and
|
|
|
a4bf14 |
in $depmod_module_dir you will only have symlink. If we resolve the
|
|
|
a4bf14 |
symlink before we pass the module path to instmod, the dracut-install
|
|
|
a4bf14 |
will only include the module with its original path, but not the
|
|
|
a4bf14 |
symlink. Hence the module can't be automatically loaded.
|
|
|
a4bf14 |
|
|
|
a4bf14 |
Dracut-install is clever enough to handle symlinks and will include both
|
|
|
a4bf14 |
the symlink and the module to the initrd.
|
|
|
a4bf14 |
|
|
|
a4bf14 |
(cherry picked from commit d1afff43aea01c8d43817adf3ac4041dd4b9f022)
|
|
|
a4bf14 |
|
|
|
a4bf14 |
Resolves: #1720275
|
|
|
a4bf14 |
---
|
|
|
a4bf14 |
modules.d/90kernel-modules-extra/module-setup.sh | 2 +-
|
|
|
a4bf14 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
a4bf14 |
|
|
|
a4bf14 |
diff --git a/modules.d/90kernel-modules-extra/module-setup.sh b/modules.d/90kernel-modules-extra/module-setup.sh
|
|
|
a4bf14 |
index c0a2b7f9..1706c822 100755
|
|
|
a4bf14 |
--- a/modules.d/90kernel-modules-extra/module-setup.sh
|
|
|
a4bf14 |
+++ b/modules.d/90kernel-modules-extra/module-setup.sh
|
|
|
a4bf14 |
@@ -187,7 +187,7 @@ installkernel()
|
|
|
a4bf14 |
printf "^%s\.ko(\.gz|\.bz2|\.xz)?:\n" "${pathlist[@]}" \
|
|
|
a4bf14 |
| (LANG=C grep -E -o -f - -- "$depmod_modules_dep" || exit 0) \
|
|
|
a4bf14 |
| tr -d ':' \
|
|
|
a4bf14 |
- | (cd "$depmod_module_dir" || exit; xargs -r realpath -e --) \
|
|
|
a4bf14 |
+ | (cd "$depmod_module_dir" || exit; xargs -r realpath -se --) \
|
|
|
a4bf14 |
| instmods || return 1
|
|
|
a4bf14 |
|
|
|
a4bf14 |
return 0
|
|
|
a4bf14 |
|