X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9e7554db871433758f661e85f8ff95501b62d935..fb9f9cdc813406041715d4c692f2b18cfd418cee:/package/block-extroot/files/50_determine_usb_root?ds=sidebyside diff --git a/package/block-extroot/files/50_determine_usb_root b/package/block-extroot/files/50_determine_usb_root index 192990c91..e87855c2a 100644 --- a/package/block-extroot/files/50_determine_usb_root +++ b/package/block-extroot/files/50_determine_usb_root @@ -4,11 +4,10 @@ # See /LICENSE for more information. -. /etc/functions.sh -. /lib/functions/extmount.sh -. /lib/functions/mount.sh - determine_external_root() { + pi_include /lib/functions/extmount.sh + pi_include /lib/functions/mount.sh + local OLD_UCI_CONFIG_DIR="$UCI_CONFIG_DIR" set_jffs_mp determine_root_device @@ -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, @@ -38,7 +38,7 @@ determine_external_root() { config_load fstab config_foreach config_mount_by_section mount 1 - [ "$rootfs_found" = "1" ] && grep -q /overlay /proc/mounts && { + [ "$rootfs_found" = "1" ] && grep -q ' /overlay ' /proc/mounts && { pi_extroot_mount_success=true pi_mount_skip_next=false }