diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-03-21 17:16:50 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-03-21 17:16:50 +0000 |
commit | 7af8ee04812f647ce74adbe04f0d5d18a39bbd29 (patch) | |
tree | 9a50a2973e0866572e2cf8394d65dba645ac3c08 /package/base-files/files/lib/upgrade/common.sh | |
parent | e7f046805af93c3af6d318907033cf0d803e4b34 (diff) | |
download | master-31e0f0ae-7af8ee04812f647ce74adbe04f0d5d18a39bbd29.tar.gz master-31e0f0ae-7af8ee04812f647ce74adbe04f0d5d18a39bbd29.tar.bz2 master-31e0f0ae-7af8ee04812f647ce74adbe04f0d5d18a39bbd29.zip |
change from /jffs to /overlay, patch from Daniel Dickinson
SVN-Revision: 20356
Diffstat (limited to 'package/base-files/files/lib/upgrade/common.sh')
-rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 3beb6484d8..970016e7ba 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -35,7 +35,7 @@ install_bin() { # <file> [ <symlink> ... ] pivot() { # <new_root> <old_root> mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1 - mkdir -p $1$2 $1/proc $1/dev $1/tmp $1/jffs && \ + mkdir -p $1$2 $1/proc $1/dev $1/tmp $1/overlay && \ mount -o move /proc $1/proc && \ pivot_root $1 $1$2 || { umount $1 $1 @@ -43,7 +43,7 @@ pivot() { # <new_root> <old_root> } mount -o move $2/dev /dev mount -o move $2/tmp /tmp - mount -o move $2/jffs /jffs 2>&- + mount -o move $2/overlay /overlay 2>&- return 0 } @@ -63,9 +63,9 @@ run_ramfs() { # <command> [...] mount -o remount,ro /mnt umount -l /mnt - grep /jffs /proc/mounts > /dev/null && { - mount -o remount,ro /jffs - umount -l /jffs + grep /overlay /proc/mounts > /dev/null && { + mount -o remount,ro /overlay + umount -l /overlay } # spawn a new shell from ramdisk to reduce the probability of cache issues |