kernel: update linux 3.2 to 3.2.12

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

diff --git a/package/base-files/files/lib/functions/boot.sh b/package/base-files/files/lib/functions/boot.sh
index a4ec7be..8c3f27b 100644 (file)
--- a/package/base-files/files/lib/functions/boot.sh
+++ b/package/base-files/files/lib/functions/boot.sh
@@ -71,7 +71,7 @@ boot_run_hook() {
 find_mtd_part() {
        local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
        local PREFIX=/dev/mtdblock
-       
+
        PART="${PART##mtd}"
        [ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
        echo "${PART:+$PREFIX$PART}"
@@ -88,11 +88,11 @@ dupe() { # <new_root> <old_root>
        cd $1
        echo -n "creating directories... "
        {
-               cd $2 
+               cd $2
                find . -xdev -type d
                echo "./dev ./overlay ./mnt ./proc ./tmp"
                # xdev skips mounted directories
-               cd $1 
+               cd $1
        } | xargs mkdir -p
        echo "done"
 
@@ -125,11 +125,13 @@ pivot() { # <new_root> <old_root>
 fopivot() { # <rw_root> <ro_root> <dupe?>
        root=$1
        {
-               if grep -q mini_fo /proc/filesystems; then
+               if grep -q overlay /proc/filesystems; then
+                       mount -t overlayfs -olowerdir=/,upperdir=$1 "overlayfs:$1" /mnt && root=/mnt
+               elif grep -q mini_fo /proc/filesystems; then
                        mount -t mini_fo -o base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt
                else
                        mount --bind / /mnt
-                       mount --bind -o union "$1" /mnt && root=/mnt 
+                       mount --bind -o union "$1" /mnt && root=/mnt
                fi
        } || {
                [ "$3" = "1" ] && {