X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fblock-extroot%2Ffiles%2F50_determine_usb_root;h=e87855c2a7777a502007cbec8adbe88748cbba20;hb=762d03aef280282c86ffd2a1a3af50381e7508d0;hp=1e5f153b6a323e2fe19cb5c32e9caf39e718f873;hpb=61b361248337b622b560ce1116eca4af7d5322a2;p=openwrt-10.03%2F.git

diff --git a/package/block-extroot/files/50_determine_usb_root b/package/block-extroot/files/50_determine_usb_root
index 1e5f153b6..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
@@ -16,9 +15,10 @@ determine_external_root() {
 	# extroot requires extroot and fstab config files, therefore 
 	# we assume configuration is incomplete and not to be used if either of them
 	# is missing (for jffs versions of these files on squashfs image)
-	if [ "$jffs" = "/jffs" ] && [ -r "/jffs/etc/config/fstab" ]; then
-		UCI_CONFIG_DIR="/jffs/etc/config"
+	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
 		}