From: Daniel Dickinson <crazycshore@gmail.com>
Date: Mon, 31 Jan 2011 05:11:38 +0000 (+0000)
Subject: block-extroot: Fixed hang when no modules in on either squashfs or jffs2 and suppress... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ef8a192e42823cbf87af5bdbe1378eb9e2e71836;p=openwrt%2Fstaging%2Faparcar.git

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
---

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