/lib/functions.sh: remove jffs2_mark_erase()
[openwrt.git] / package / base-files / files / lib / functions.sh
index e7ca02a..018fe2c 100755 (executable)
@@ -17,10 +17,6 @@ NO_EXPORT=1
 LOAD_STATE=1
 LIST_SEP=" "
 
-hotplug_dev() {
-       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
-}
-
 append() {
        local var="$1"
        local value="$2"
@@ -38,21 +34,6 @@ list_contains() {
        [ "${val%% $str *}" != "$val" ]
 }
 
-list_remove() {
-       local var="$1"
-       local remove="$2"
-       local val
-
-       eval "val=\" \${$var} \""
-       val1="${val%% $remove *}"
-       [ "$val1" = "$val" ] && return
-       val2="${val##* $remove }"
-       [ "$val2" = "$val" ] && return
-       val="${val1## } ${val2%% }"
-       val="${val%% }"
-       eval "export ${NO_EXPORT:+-n} -- \"$var=\$val\""
-}
-
 config_load() {
        [ -n "$IPKG_INSTROOT" ] && return 0
        uci_load "$@"
@@ -125,19 +106,6 @@ config_unset() {
        config_set "$1" "$2" ""
 }
 
-config_clear() {
-       local SECTION="$1"
-       local oldvar
-
-       list_remove CONFIG_SECTIONS "$SECTION"
-       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
-
-       for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \
-               sed -e 's/\(.*\)=.*$/\1/'` ; do
-               unset $oldvar
-       done
-}
-
 # config_get <variable> <section> <option> [<default>]
 # config_get <section> <option>
 config_get() {
@@ -363,52 +331,6 @@ macaddr_canonicalize()
        printf "%02x:%02x:%02x:%02x:%02x:%02x" 0x${canon// / 0x} 2>/dev/null
 }
 
-strtok() { # <string> { <variable> [<separator>] ... }
-       local tmp
-       local val="$1"
-       local count=0
-
-       shift
-
-       while [ $# -gt 1 ]; do
-               tmp="${val%%$2*}"
-
-               [ "$tmp" = "$val" ] && break
-
-               val="${val#$tmp$2}"
-
-               export ${NO_EXPORT:+-n} "$1=$tmp"; count=$((count+1))
-               shift 2
-       done
-
-       if [ $# -gt 0 -a -n "$val" ]; then
-               export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1))
-       fi
-
-       return $count
-}
-
-
-jffs2_mark_erase() {
-       local part="$(find_mtd_part "$1")"
-       [ -z "$part" ] && {
-               echo Partition not found.
-               return 1
-       }
-       echo -e "\xde\xad\xc0\xde" | mtd -qq write - "$1"
-}
-
-uci_apply_defaults() {
-       cd /etc/uci-defaults || return 0
-       files="$(ls)"
-       [ -z "$files" ] && return 0
-       mkdir -p /tmp/.uci
-       for file in $files; do
-               ( . "./$(basename $file)" ) && rm -f "$file"
-       done
-       uci commit
-}
-
 group_add() {
        local name="$1"
        local gid="$2"
@@ -446,162 +368,4 @@ user_exists() {
        grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/passwd
 }
 
-
-pi_include() {
-       if [ -f "/tmp/overlay/$1" ]; then
-               . "/tmp/overlay/$1"
-       elif [ -f "$1" ]; then
-               . "$1"
-       elif [ -d "/tmp/overlay/$1" ]; then
-               if [ -n "$(ls /tmp/overlay/$1/*.sh 2>/dev/null)" ]; then
-                       for src_script in /tmp/overlay/$1/*.sh; do
-                               . "$src_script"
-                       done
-               fi
-       elif [ -d "$1" ]; then
-               if [ -n "$(ls $1/*.sh 2>/dev/null)" ]; then
-                       for src_script in $1/*.sh; do
-                               . "$src_script"
-                       done
-               fi
-       else
-               echo "WARNING: $1 not found"
-               return 1
-       fi
-       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>
-       /bin/mount -o noatime,move /proc $1/proc && \
-       pivot_root $1 $1$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
-                       /bin/mount -o noatime,lowerdir=/,upperdir=$1 -t overlayfs "overlayfs:$1" /mnt && root=/mnt
-               elif grep -q mini_fo /proc/filesystems; then
-                       /bin/mount -t mini_fo -o noatime,base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt
-               else
-                       /bin/mount --bind -o noatime / /mnt
-                       /bin/mount --bind -o noatime,union "$1" /mnt && root=/mnt
-               fi
-       } || {
-               [ "$3" = "1" ] && {
-               /bin/mount | grep "on $1 type" 2>&- 1>&- || /bin/mount -o noatime,bind $1 $1
-               dupe $1 $rom
-               }
-       }
-       pivot $root $2
-}
-
-ramoverlay() {
-       mkdir -p /tmp/root
-       /bin/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