/lib/functions.sh: remove jffs2_ready()

[openwrt.git] / package / base-files / files / lib / functions.sh

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index 6f23e0b..e05108c 100755 (executable)
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -533,74 +533,25 @@ boot_run_hook() {
        done
 }
 
-jffs2_ready() {
-       mtdpart="$(find_mtd_part rootfs_data)"
-       [ -z "$mtdpart" ] && return 1
-       magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
-       [ "$magic" != "deadc0de" ]
-}
-
-dupe() { # <new_root> <old_root>
-       cd $1
-       echo -n "creating directories... "
-       {
-               cd $2
-               find . -xdev -type d
-               echo "./dev ./overlay ./mnt ./proc ./tmp"
-               # xdev skips mounted directories
-               cd $1
-       } | xargs mkdir -p
-       echo "done"
-
-       echo -n "setting up symlinks... "
-       for file in $(cd $2; find . -xdev -type f;); do
-               case "$file" in
-               ./rom/note) ;; #nothing
-               ./etc/config*|\
-               ./usr/lib/opkg/info/*) cp -af $2/$file $file;;
-               *) ln -sf /rom/${file#./*} $file;;
-               esac
-       done
-       for file in $(cd $2; find . -xdev -type l;); do
-               cp -af $2/${file#./*} $file
-       done
-       echo "done"
-}
-
 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
        }
 }
 
 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
-               elif grep -q mini_fo /proc/filesystems; then
-                       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
-               fi
-       } || {
-               [ "$3" = "1" ] && {
-               mount | grep "on $1 type" 2>&- 1>&- || mount -o noatime,bind $1 $1
-               dupe $1 $rom
-               }
-       }
-       pivot $root $2
+       /bin/mount -o noatime,lowerdir=/,upperdir=$1 -t overlayfs "overlayfs:$1" /mnt
+       pivot /mnt $2
 }
 
 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
 }