mklibs: properly fix library linking - the relinking in some instances used static...

[openwrt.git] / package / block-extroot / files / extmount.sh

diff --git a/package/block-extroot/files/extmount.sh b/package/block-extroot/files/extmount.sh
index f696324..1d5ebf2 100644 (file)
--- 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
        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
                cat $modules | sed -e 's/^\([^#].*\)/insmod \.\/\1.ko/'| sh 2>&- || :
        }
        rm -rf /tmp/extroot_modules