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 | 6e84b166c4911c234aba20c8da35f8e961c63bd7 (patch) | |
| tree | e138e970fbc908b545200b9015dd51bdfe592169 /package/base-files/files/lib/upgrade | |
| parent | a229f681cec8ad6a5623cb3fd829e35a83f8bbcc (diff) | |
| download | upstream-6e84b166c4911c234aba20c8da35f8e961c63bd7.tar.gz upstream-6e84b166c4911c234aba20c8da35f8e961c63bd7.tar.bz2 upstream-6e84b166c4911c234aba20c8da35f8e961c63bd7.zip | |
change from /jffs to /overlay, patch from Daniel Dickinson
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20356 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/lib/upgrade')
| -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 |