package/modules: enable ECHI/OHCI for RT3883

[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 46b4613..6bdd7a1 100644 (file)
--- a/package/base-files/files/lib/functions/boot.sh
+++ b/package/base-files/files/lib/functions/boot.sh
@@ -2,19 +2,70 @@
 # Copyright (C) 2006-2010 OpenWrt.org
 # Copyright (C) 2010 Vertical Communications
 
 # Copyright (C) 2006-2010 OpenWrt.org
 # Copyright (C) 2010 Vertical Communications
 

+mount() {
+       /bin/busybox mount -o noatime "$@"
+}
+
+boot_hook_splice_start() {
+       export -n PI_HOOK_SPLICE=1
+}
+
+boot_hook_splice_finish() {
+       local hook
+       for hook in $PI_STACK_LIST; do
+               local v; eval "v=\${${hook}_splice:+\$${hook}_splice }$hook"
+               export -n "${hook}=${v% }"
+               export -n "${hook}_splice="
+       done
+       export -n PI_HOOK_SPLICE=
+}
+
+boot_hook_init() {
+       local hook="${1}_hook"
+       export -n "PI_STACK_LIST=${PI_STACK_LIST:+$PI_STACK_LIST }$hook"
+       export -n "$hook="
+}
+

 boot_hook_add() {
 boot_hook_add() {

-       local hook="${1}_hook"
-       local value="$2"
-       local sep=" "
-       
-       eval "$hook=\"\${$hook:+\${$hook}\${value:+\$sep}}\$value\""
+       local hook="${1}_hook${PI_HOOK_SPLICE:+_splice}"
+       local func="${2}"
+
+       [ -n "$func" ] && {
+               local v; eval "v=\$$hook"
+               export -n "$hook=${v:+$v }$func"
+       }
+}
+
+boot_hook_shift() {
+       local hook="${1}_hook"
+       local rvar="${2}"
+
+       local v; eval "v=\$$hook"
+       [ -n "$v" ] && {
+               local first="${v%% *}"
+
+               [ "$v" != "${v#* }" ] && \
+                       export -n "$hook=${v#* }" || \
+                       export -n "$hook="
+
+               export -n "$rvar=$first"
+               return 0
+       }
+
+       return 1

 }
 
 boot_run_hook() {
 }
 
 boot_run_hook() {

-    local boot_func
-    for boot_func in $(eval "echo \"\$${1}_hook\""); do
-       $boot_func "$1" "$2"
-    done
+       local hook="$1"
+       local func
+
+       while boot_hook_shift "$hook" func; do
+               local ran; eval "ran=\$PI_RAN_$func"
+               [ -n "$ran" ] || {
+                       export -n "PI_RAN_$func=1"
+                       $func "$1" "$2"
+               }
+       done

 }
 
 find_mtd_part() {
 }
 
 find_mtd_part() {


@@ -27,9 +78,10 @@ find_mtd_part() {
 }
 
 jffs2_ready () {
 }
 
 jffs2_ready () {

-    mtdpart="$(find_mtd_part rootfs_data)"
-    magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
-    [ "$magic" != "deadc0de" ]
+       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>
 }
 
 dupe() { # <new_root> <old_root>


@@ -38,7 +90,7 @@ dupe() { # <new_root> <old_root>
        {
                cd $2 
                find . -xdev -type d
        {
                cd $2 
                find . -xdev -type d

-               echo "./dev ./jffs ./mnt ./proc ./tmp"
+               echo "./dev ./overlay ./mnt ./proc ./tmp"

                # xdev skips mounted directories
                cd $1 
        } | xargs mkdir -p
                # xdev skips mounted directories
                cd $1 
        } | xargs mkdir -p


@@ -65,7 +117,7 @@ pivot() { # <new_root> <old_root>
                mount -o move $2/dev /dev
                mount -o move $2/tmp /tmp
                mount -o move $2/sys /sys 2>&-
                mount -o move $2/dev /dev
                mount -o move $2/tmp /tmp
                mount -o move $2/sys /sys 2>&-

-               mount -o move $2/jffs /jffs 2>&-
+               mount -o move $2/overlay /overlay 2>&-

                return 0
        }
 }
                return 0
        }
 }


@@ -73,7 +125,9 @@ pivot() { # <new_root> <old_root>
 fopivot() { # <rw_root> <ro_root> <dupe?>
        root=$1
        {
 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 -t mini_fo -o base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt
                else
                        mount --bind / /mnt


@@ -90,6 +144,7 @@ fopivot() { # <rw_root> <ro_root> <dupe?>
 
 ramoverlay() {
        mkdir -p /tmp/root
 
 ramoverlay() {
        mkdir -p /tmp/root

-       mount -t tmpfs root /tmp/root
+       mount -t tmpfs -o mode=0755 root /tmp/root

        fopivot /tmp/root /rom 1
 }
        fopivot /tmp/root /rom 1
 }

+