block-mount block-extroot: Bump packages versions forgetten during previous two commits

[openwrt/staging/wigyori.git] / package / block-extroot / files / 60_pivot_usb_root

diff --git a/package/block-extroot/files/60_pivot_usb_root b/package/block-extroot/files/60_pivot_usb_root
index c8572a35fd214e75e545955e1a1abda165239f6f..b610a4ade15e896dab42841d826ad23d0aa81b33 100644 (file)
--- a/package/block-extroot/files/60_pivot_usb_root
+++ b/package/block-extroot/files/60_pivot_usb_root
@@ -9,10 +9,17 @@
 external_root_pivot() {
        check_skip || [ "$pi_extroot_mount_success" != "true" ] || {
                echo "switching to external rootfs"
-               if [ "$ER_IS_SQUASHFS" = "true" ]; then
-                       umount /jffs
+               if [ "$ER_OVERLAY_ROM" = "/overlay" ]; then
+                       if [ "$ER_IS_SQUASHFS" = "true" ]; then
+                               umount /tmp/overlay
+                       fi
+                       mount -o remount,ro / && fopivot /overlay /rom && pi_mount_skip_next=true
+               elif [ "$ER_OVERLAY_ROM" = "/rom" ]; then
+                       if [ "$ER_IS_SQUASHFS" = "true" ]; then
+                               umount /tmp/overlay
+                       fi
+                       mount -o remount,ro / && pivot_rom /rom /rom && pi_mount_skip_next=true
                fi
-               mount -o remount,ro / && fopivot /overlay /rom && pi_mount_skip_next=true
        }
 }