change from /jffs to /overlay, patch from Daniel Dickinson

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20356 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 3 insertions, 3 deletions

diff --git a/package/block-extroot/files/50_determine_usb_root b/package/block-extroot/files/50_determine_usb_root
index 1e5f153b6..192990c91 100644
--- a/package/block-extroot/files/50_determine_usb_root
+++ b/package/block-extroot/files/50_determine_usb_root
@@ -16,8 +16,8 @@ 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
 	fi
 
diff --git a/package/block-extroot/files/60_pivot_usb_root b/package/block-extroot/files/60_pivot_usb_root
index c8572a35f..1c9be97ca 100644
--- a/package/block-extroot/files/60_pivot_usb_root
+++ b/package/block-extroot/files/60_pivot_usb_root
@@ -10,7 +10,7 @@ external_root_pivot() {
 	check_skip || [ "$pi_extroot_mount_success" != "true" ] || {
 		echo "switching to external rootfs"
 		if [ "$ER_IS_SQUASHFS" = "true" ]; then
-			umount /jffs
+			umount /tmp/overlay
 		fi
 		mount -o remount,ro / && fopivot /overlay /rom && pi_mount_skip_next=true
 	}