diff options
author | Mirko Vogt <mirko@openwrt.org> | 2012-12-19 16:07:46 +0000 |
---|---|---|
committer | Mirko Vogt <mirko@openwrt.org> | 2012-12-19 16:07:46 +0000 |
commit | 439a869090282f229cf0edb41cc2d6e94f02b5c2 (patch) | |
tree | 566a9d008c55d34f6acf6734d220dcd0a9490177 /package/base-files/files/lib/upgrade | |
parent | ec9ce7e0890276486776a1d0862f0e6ce7ede577 (diff) | |
download | master-31e0f0ae-439a869090282f229cf0edb41cc2d6e94f02b5c2.tar.gz master-31e0f0ae-439a869090282f229cf0edb41cc2d6e94f02b5c2.tar.bz2 master-31e0f0ae-439a869090282f229cf0edb41cc2d6e94f02b5c2.zip |
Do not overload mount-call - trying to reduce confusion
The behaviour of calling 'mount' differed depending on whether it called
the busybox-mount, the mount of util-linux, the mount defined in
/lib/functions.sh and /lib/functions/boot.sh
/etc/preinit even included /lib/functions.sh and /lib/functions/boot.sh,
both re-defining 'mount'.
SVN-Revision: 34792
Diffstat (limited to 'package/base-files/files/lib/upgrade')
-rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index e6de34849a..e796c7bacd 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -36,16 +36,16 @@ 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/sys $1/dev $1/tmp $1/overlay && \ - mount -o move /proc $1/proc && \ + mount -o noatime,move /proc $1/proc && \ pivot_root $1 $1$2 || { umount $1 $1 return 1 } - mount -o move $2/sys /sys - mount -o move $2/dev /dev - mount -o move $2/tmp /tmp - mount -o move $2/overlay /overlay 2>&- + mount -o noatime,move $2/sys /sys + mount -o noatime,move $2/dev /dev + mount -o noatime,move $2/tmp /tmp + mount -o noatime,move $2/overlay /overlay 2>&- return 0 } @@ -71,7 +71,7 @@ run_ramfs() { # <command> [...] umount -l /mnt grep /overlay /proc/mounts > /dev/null && { - mount -o remount,ro /overlay + mount -o noatime,remount,ro /overlay umount -l /overlay } |