diff options
| author | John Crispin <john@openwrt.org> | 2013-12-27 21:15:09 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-12-27 21:15:09 +0000 |
| commit | 834204bda64d78c5c2d6228c236246291a1ed7d8 (patch) | |
| tree | 2dd473525908ecdb2b2749daf901507953e807a0 /package/base-files/files/lib/functions.sh | |
| parent | 9715b61b3cbae4065226031151530e099e913e21 (diff) | |
| download | master-31e0f0ae-834204bda64d78c5c2d6228c236246291a1ed7d8.tar.gz master-31e0f0ae-834204bda64d78c5c2d6228c236246291a1ed7d8.tar.bz2 master-31e0f0ae-834204bda64d78c5c2d6228c236246291a1ed7d8.zip | |
base-files: fix mount-utils incompatibility
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
SVN-Revision: 39169
Diffstat (limited to 'package/base-files/files/lib/functions.sh')
| -rwxr-xr-x | package/base-files/files/lib/functions.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 6f23e0b8b2..e7ca02a655 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -568,12 +568,12 @@ dupe() { # <new_root> <old_root> } pivot() { # <new_root> <old_root> - mount -o noatime,move /proc $1/proc && \ + /bin/mount -o noatime,move /proc $1/proc && \ pivot_root $1 $1$2 && { - mount -o noatime,move $2/dev /dev - mount -o noatime,move $2/tmp /tmp - mount -o noatime,move $2/sys /sys 2>&- - mount -o noatime,move $2/overlay /overlay 2>&- + /bin/mount -o noatime,move $2/dev /dev + /bin/mount -o noatime,move $2/tmp /tmp + /bin/mount -o noatime,move $2/sys /sys 2>&- + /bin/mount -o noatime,move $2/overlay /overlay 2>&- return 0 } } @@ -582,16 +582,16 @@ fopivot() { # <rw_root> <ro_root> <dupe?> root=$1 { if grep -q overlay /proc/filesystems; then - mount -o noatime,lowerdir=/,upperdir=$1 -t overlayfs "overlayfs:$1" /mnt && root=/mnt + /bin/mount -o noatime,lowerdir=/,upperdir=$1 -t overlayfs "overlayfs:$1" /mnt && root=/mnt elif grep -q mini_fo /proc/filesystems; then - mount -t mini_fo -o noatime,base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt + /bin/mount -t mini_fo -o noatime,base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt else - mount --bind -o noatime / /mnt - mount --bind -o noatime,union "$1" /mnt && root=/mnt + /bin/mount --bind -o noatime / /mnt + /bin/mount --bind -o noatime,union "$1" /mnt && root=/mnt fi } || { [ "$3" = "1" ] && { - mount | grep "on $1 type" 2>&- 1>&- || mount -o noatime,bind $1 $1 + /bin/mount | grep "on $1 type" 2>&- 1>&- || /bin/mount -o noatime,bind $1 $1 dupe $1 $rom } } @@ -600,7 +600,7 @@ fopivot() { # <rw_root> <ro_root> <dupe?> ramoverlay() { mkdir -p /tmp/root - mount -t tmpfs -o noatime,mode=0755 root /tmp/root + /bin/mount -t tmpfs -o noatime,mode=0755 root /tmp/root fopivot /tmp/root /rom 1 } |