[package] block-mount: Changed default filesystem for /e/c/fstab to be ext4 instead...

[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..44d662e 100644 (file)
--- a/package/block-extroot/files/extmount.sh
+++ b/package/block-extroot/files/extmount.sh
@@ -17,10 +17,20 @@ 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
 }
 
+pivot_rom() { # <new_root> <old_root>
+       mount -o move /proc $1/proc && \
+       pivot_root $1 $1$2 && {
+               mount -o move $2/dev /dev
+               mount -o move $2/tmp /tmp
+               mount -o move $2/sys /sys 2>&-
+               return 0
+       }
+}
+