From 4c43cacce0f5a2b19f8d72efb8b458761e7e6dbe Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 21 Jun 2013 16:53:59 +0000 Subject: [PATCH] base-files: module loading is now handled by ubox/kmodloader Signed-off-by: John Crispin SVN-Revision: 37003 --- package/base-files/files/etc/init.d/boot | 6 +----- package/base-files/files/lib/functions.sh | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index d33e8ce7f8..de6a2a6025 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -48,11 +48,7 @@ start() { grep -q debugfs /proc/filesystems && mount -o noatime -t debugfs debugfs /sys/kernel/debug [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe - if [ -f /sbin/kmodloader ]; then - /sbin/kmodloader - else - load_modules /etc/modules.d/* - fi + /sbin/kmodloader # allow wifi modules time to settle sleep 1 diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index f51bfea45d..42d76fd67d 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -203,13 +203,6 @@ config_list_foreach() { done } -load_modules() { - [ -d /etc/modules.d ] && { - cd /etc/modules.d - sed 's/^[^#]/insmod &/' $* | ash 2>&- || : - } -} - include() { local file -- 2.25.1