package: fix insmod on install

[openwrt/staging/wigyori.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 db59706bc5aeb2db958395edfad7bbc989fa93ae..bc521b07ee0c906ac5fc4ebff0e20a2efbcf76af 100755 (executable)
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 # Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
+# Copyright (C) 2010 Vertical Communications
 
 
 debug () {
@@ -197,12 +198,12 @@ config_list_foreach() {
        [ -z "$len" ] && return 0
        while [ $c -le "$len" ]; do
                config_get val "${section}" "${option}_ITEM$c"
-               eval "$function \"\$val\" \"$@\""
+               eval "$function \"\$val\" \"\$@\""
                c="$(($c + 1))"
        done
 }
 
-load_modules() {
+insert_modules() {
        [ -d /etc/modules.d ] && {
                cd /etc/modules.d
                sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
@@ -240,6 +241,64 @@ find_mtd_chardev() {
        echo "${INDEX:+$PREFIX$INDEX}"
 }
 
+mtd_get_mac_ascii()
+{
+       local mtdname="$1"
+       local key="$2"
+       local part
+       local mac_dirty
+
+       . /lib/functions.sh
+
+       part=$(find_mtd_part "$mtdname")
+       if [ -z "$part" ]; then
+               echo "mtd_get_mac_ascii: partition $mtdname not found!" >&2
+               return
+       fi
+
+       mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p')
+       # "canonicalize" mac
+       printf "%02x:%02x:%02x:%02x:%02x:%02x" 0x${mac_dirty//:/ 0x}
+}
+
+mtd_get_mac_binary() {
+       local mtdname="$1"
+       local offset="$2"
+       local part
+
+       part=$(find_mtd_part "$mtdname")
+       if [ -z "$part" ]; then
+               echo "mtd_get_mac_binary: partition $mtdname not found!" >&2
+               return
+       fi
+
+       dd bs=1 skip=$offset count=6 if=$part 2>/dev/null | hexdump -v -n 6 -e '5/1 "%02x:" 1/1 "%02x"'
+}
+
+macaddr_add() {
+       local mac=$1
+       local val=$2
+       local oui=${mac%:*:*:*}
+       local nic=${mac#*:*:*:}
+
+       nic=$(printf "%06x" $((0x${nic//:/} + $val & 0xffffff)) | sed 's/^\(.\{2\}\)\(.\{2\}\)\(.\{2\}\)/\1:\2:\3/')
+       echo $oui:$nic
+}
+
+macaddr_setbit_la()
+{
+       local mac=$1
+
+       printf "%02x:%s" $((0x${mac%%:*} | 0x02)) ${mac#*:}
+}
+
+macaddr_2bin()
+{
+       local mac=$1
+
+       echo -ne \\x${mac//:/\\x}
+}
+
 strtok() { # <string> { <variable> [<separator>] ... }
        local tmp
        local val="$1"
@@ -348,4 +407,137 @@ pi_include() {
        return 0
 }
 
+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() {
+       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() {
+       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
+}
+
+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 && \
+       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>&-
+               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
+}
+
+ramoverlay() {
+       mkdir -p /tmp/root
+       mount -t tmpfs -o noatime,mode=0755 root /tmp/root
+       fopivot /tmp/root /rom 1
+}
+
 [ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh