aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-06-21 16:53:59 +0000
committerJohn Crispin <john@openwrt.org>2013-06-21 16:53:59 +0000
commit4c43cacce0f5a2b19f8d72efb8b458761e7e6dbe (patch)
tree926788beb44316251ef2a5b18e60a1a995094724
parentd0db343fc4bf2afc98e333e2957bd2cde249ae8b (diff)
downloadupstream-4c43cacce0f5a2b19f8d72efb8b458761e7e6dbe.tar.gz
upstream-4c43cacce0f5a2b19f8d72efb8b458761e7e6dbe.tar.bz2
upstream-4c43cacce0f5a2b19f8d72efb8b458761e7e6dbe.zip
base-files: module loading is now handled by ubox/kmodloader
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 37003
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot6
-rwxr-xr-xpackage/base-files/files/lib/functions.sh7
2 files changed, 1 insertions, 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