aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dickinson <crazycshore@gmail.com>2011-01-31 05:11:38 +0000
committerDaniel Dickinson <crazycshore@gmail.com>2011-01-31 05:11:38 +0000
commitef8a192e42823cbf87af5bdbe1378eb9e2e71836 (patch)
tree06e48a5a901e6b94c0237e1f935682533015c0a2
parente00933b6d656f23412b9bb43863e88e723dcab65 (diff)
downloadupstream-ef8a192e42823cbf87af5bdbe1378eb9e2e71836.tar.gz
upstream-ef8a192e42823cbf87af5bdbe1378eb9e2e71836.tar.bz2
upstream-ef8a192e42823cbf87af5bdbe1378eb9e2e71836.zip
block-extroot: Fixed hang when no modules in on either squashfs or jffs2 and suppressed extraneous not found error message when no modules on jffs2.
SVN-Revision: 25259
-rw-r--r--package/block-extroot/files/extmount.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/block-extroot/files/extmount.sh b/package/block-extroot/files/extmount.sh
index f696324f71..1d5ebf26fa 100644
--- a/package/block-extroot/files/extmount.sh
+++ b/package/block-extroot/files/extmount.sh
@@ -17,8 +17,8 @@ er_load_modules() {
mkdir -p /tmp/extroot_modules/modules
ln -sf /etc/modules.d/* /tmp/overlay/etc/modules.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/*)"
- cd /tmp/extroot_modules/modules && {
+ local modules="$(grep -l '# May be required for rootfs' /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>&- || :
}
rm -rf /tmp/extroot_modules