Revert "kernel: do not try to probe builtin modules on empty kmod package install"

This change currently causes some issues with loading out of tree kernel modules
so revert that commit for now.

Reverts commit 34c01e68b5. Fixes FS#919.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2017-07-21 18:53:07 +02:00
parent e3d135ab56
commit 3e26340a2e

View File

@ -136,7 +136,6 @@ define ModuleAutoLoad
local mod; \ local mod; \
shift 2; \ shift 2; \
for mod in $$$$$$$$mods; do \ for mod in $$$$$$$$mods; do \
[ -e $(2)/$(MODULES_SUBDIR)/$$$$$$$$mod.ko ] || continue; \
mkdir -p $(2)/etc/modules.d; \ mkdir -p $(2)/etc/modules.d; \
echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$(1); \ echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$(1); \
done; \ done; \
@ -155,7 +154,6 @@ define ModuleAutoLoad
local mod; \ local mod; \
shift 3; \ shift 3; \
for mod in $$$$$$$$mods; do \ for mod in $$$$$$$$mods; do \
[ -e $(2)/$(MODULES_SUBDIR)/$$$$$$$$mod.ko ] || continue; \
mkdir -p $(2)/etc/modules.d; \ mkdir -p $(2)/etc/modules.d; \
echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ echo "$$$$$$$$mod" >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \
done; \ done; \