aboutsummaryrefslogtreecommitdiffstats
path: root/package/block-mount/files/extmount.sh
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2011-10-28 13:10:50 +0000
committerNicolas Thill <nico@openwrt.org>2011-10-28 13:10:50 +0000
commiteaa595d6ac14918dbeafc1d489f9312110276498 (patch)
tree1350291acca1e46ef0f558931e62845bdbf46943 /package/block-mount/files/extmount.sh
parent57334f059f724fa6be13eced3f48782e695ee949 (diff)
downloadupstream-eaa595d6ac14918dbeafc1d489f9312110276498.tar.gz
upstream-eaa595d6ac14918dbeafc1d489f9312110276498.tar.bz2
upstream-eaa595d6ac14918dbeafc1d489f9312110276498.zip
package/blockmount: simplify extroot module loading logic
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28650 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/block-mount/files/extmount.sh')
-rw-r--r--package/block-mount/files/extmount.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/block-mount/files/extmount.sh b/package/block-mount/files/extmount.sh
index 44d662e63a..41a0e23863 100644
--- a/package/block-mount/files/extmount.sh
+++ b/package/block-mount/files/extmount.sh
@@ -1,5 +1,6 @@
#!/bin/sh
-# Copyright 2010 Vertical Communications
+# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2010 Vertical Communications
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -15,9 +16,9 @@ set_jffs_mp() {
er_load_modules() {
mkdir -p /tmp/extroot_modules/modules.d
mkdir -p /tmp/extroot_modules/modules
- ln -sf /etc/modules.d/* /tmp/overlay/etc/modules.d/* /tmp/extroot_modules/modules.d
+ cp -L /etc/modules-boot.d/* /tmp/overlay/etc/modules-boot.d/* /tmp/extroot_modules/modules.d
ln -sf /lib/modules/*/* /tmp/overlay/lib/modules/*/* /tmp/extroot_modules/modules
- local modules="$(grep -l '# May be required for rootfs' /tmp/extroot_modules/modules.d/* 2>/dev/null)"
+ local modules="$(cat /tmp/extroot_modules/modules.d/* 2>/dev/null)"
cd /tmp/extroot_modules/modules && [ -n "$modules" ] && {
cat $modules | sed -e 's/^\([^#].*\)/insmod \.\/\1.ko/'| sh 2>&- || :
}