diff options
| author | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2011-01-31 05:11:38 +0000 |
|---|---|---|
| committer | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2011-01-31 05:11:38 +0000 |
| commit | ec635ea26815d4afe7d3cb5ca4aa30282367f08a (patch) | |
| tree | d1c8560d86c9a8e4f5313ca0dbcd52508e4397bc /package/block-extroot | |
| parent | 2236171bfe21540c7059edd03ec5009e01b27dee (diff) | |
| download | master-187ad058-ec635ea26815d4afe7d3cb5ca4aa30282367f08a.tar.gz master-187ad058-ec635ea26815d4afe7d3cb5ca4aa30282367f08a.tar.bz2 master-187ad058-ec635ea26815d4afe7d3cb5ca4aa30282367f08a.zip | |
[package]: 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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25259 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/block-extroot')
| -rw-r--r-- | package/block-extroot/files/extmount.sh | 4 |
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 |