[package] block-mount block-extroot: Bump packages versions forgetten during previous...

[openwrt/svn-archive/archive.git] / package / block-extroot / files / 50_determine_usb_root

diff --git a/package/block-extroot/files/50_determine_usb_root b/package/block-extroot/files/50_determine_usb_root
index 98ec0016e2951bcba861daa000c0d91b5a478e72..8c5841e32b08aa3839beb4359674374cf6e2f31e 100644 (file)
--- a/package/block-extroot/files/50_determine_usb_root
+++ b/package/block-extroot/files/50_determine_usb_root
@@ -5,9 +5,8 @@
 
 
 determine_external_root() {
-       . /etc/functions.sh
-       . /lib/functions/extmount.sh
-       . /lib/functions/mount.sh
+       pi_include /lib/functions/extmount.sh
+       pi_include /lib/functions/mount.sh
 
        local OLD_UCI_CONFIG_DIR="$UCI_CONFIG_DIR"
        set_jffs_mp
@@ -19,6 +18,7 @@ determine_external_root() {
        if [ "$jffs" = "/tmp/overlay" ] && [ -r "/tmp/overlay/etc/config/fstab" ]; then
                UCI_CONFIG_DIR="/tmp/overlay/etc/config"
                ER_IS_SQUASHFS=true
+               ER_OVERLAY_PREFIX="/tmp/overlay"
        fi
 
        # For squashfs on firstboot root_device will be tmpfs for the ramoverlay,
@@ -37,10 +37,17 @@ determine_external_root() {
                } 
                config_load fstab
                config_foreach config_mount_by_section mount 1
+               ER_OVERLAY_ROM="/no-extroot"
                
                [ "$rootfs_found" = "1" ] && grep -q ' /overlay ' /proc/mounts && { 
                        pi_extroot_mount_success=true
                        pi_mount_skip_next=false
+                       ER_OVERLAY_ROM="/overlay"
+               }
+               [ "$rootfs_found" = "1" ] && grep -q ' /rom ' /proc/mounts && { 
+                       pi_extroot_mount_success=true
+                       pi_mount_skip_next=false
+                       ER_OVERLAY_ROM="/rom"
                }
        }
        UCI_CONFIG_DIR="$OLD_UCI_CONFIG_DIR"