aboutsummaryrefslogtreecommitdiffstats
path: root/package/block-extroot
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-03-21 17:16:50 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-03-21 17:16:50 +0000
commit7af8ee04812f647ce74adbe04f0d5d18a39bbd29 (patch)
tree9a50a2973e0866572e2cf8394d65dba645ac3c08 /package/block-extroot
parente7f046805af93c3af6d318907033cf0d803e4b34 (diff)
downloadupstream-7af8ee04812f647ce74adbe04f0d5d18a39bbd29.tar.gz
upstream-7af8ee04812f647ce74adbe04f0d5d18a39bbd29.tar.bz2
upstream-7af8ee04812f647ce74adbe04f0d5d18a39bbd29.zip
change from /jffs to /overlay, patch from Daniel Dickinson
SVN-Revision: 20356
Diffstat (limited to 'package/block-extroot')
-rw-r--r--package/block-extroot/files/50_determine_usb_root4
-rw-r--r--package/block-extroot/files/60_pivot_usb_root2
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 1e5f153b6a..192990c919 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 c8572a35fd..1c9be97cae 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
}