base-files: allow specifiying rootdev for find_mmc_part

[openwrt/staging/chunkeey.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
old mode 100755 (executable)
new mode 100644 (file)
index b118c83..ee0c338
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (C) 2006-2014 OpenWrt.org
 # Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
 # Copyright (C) 2010 Vertical Communications
@@ -107,21 +106,33 @@ config_unset() {
 # config_get <variable> <section> <option> [<default>]
 # config_get <section> <option>
 config_get() {
-       case "$3" in
-               "") eval echo "\"\${CONFIG_${1}_${2}:-\${4}}\"";;
-               *)  eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";;
+       case "$2${3:-$1}" in
+               *[!A-Za-z0-9_]*) : ;;
+               *)
+                       case "$3" in
+                               "") eval echo "\"\${CONFIG_${1}_${2}:-\${4}}\"";;
+                               *)  eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";;
+                       esac
+               ;;
        esac
 }
 
-# config_get_bool <variable> <section> <option> [<default>]
-config_get_bool() {
-       local _tmp
-       config_get _tmp "$2" "$3" "$4"
+# get_bool <value> [<default>]
+get_bool() {
+       local _tmp="$1"
        case "$_tmp" in
                1|on|true|yes|enabled) _tmp=1;;
                0|off|false|no|disabled) _tmp=0;;
-               *) _tmp="$4";;
+               *) _tmp="$2";;
        esac
+       echo -n "$_tmp"
+}
+
+# config_get_bool <variable> <section> <option> [<default>]
+config_get_bool() {
+       local _tmp
+       config_get _tmp "$2" "$3" "$4"
+       _tmp="$(get_bool "$_tmp" "$4")"
        export ${NO_EXPORT:+-n} "$1=$_tmp"
 }
 
@@ -143,7 +154,7 @@ config_foreach() {
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
                config_get cfgtype "$section" TYPE
-               [ -n "$___type" -a "x$cfgtype" != "x$___type" ] && continue
+               [ -n "$___type" ] && [ "x$cfgtype" != "x$___type" ] && continue
                eval "$___function \"\$section\" \"\$@\""
        done
 }
@@ -176,7 +187,7 @@ default_prerm() {
                ret=$?
        fi
 
-       local shell="$(which bash)"
+       local shell="$(command -v bash)"
        for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do
                if [ -n "$root" ]; then
                        ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable
@@ -198,10 +209,10 @@ add_group_and_user() {
        if [ -n "$rusers" ]; then
                local tuple oIFS="$IFS"
                for tuple in $rusers; do
-                       local uid gid uname gname
+                       local uid gid uname gname addngroups addngroup addngname addngid
 
                        IFS=":"
-                       set -- $tuple; uname="$1"; gname="$2"
+                       set -- $tuple; uname="$1"; gname="$2"; addngroups="$3"
                        IFS="="
                        set -- $uname; uname="$1"; uid="$2"
                        set -- $gname; gname="$1"; gid="$2"
@@ -221,7 +232,24 @@ add_group_and_user() {
                                group_add_user "$gname" "$uname"
                        fi
 
-                       unset uid gid uname gname
+                       if [ -n "$uname" ] &&  [ -n "$addngroups" ]; then
+                               oIFS="$IFS"
+                               IFS=","
+                               for addngroup in $addngroups ; do
+                                       IFS="="
+                                       set -- $addngroup; addngname="$1"; addngid="$2"
+                                       if [ -n "$addngid" ]; then
+                                               group_exists "$addngname" || group_add "$addngname" "$addngid"
+                                       else
+                                               group_add_next "$addngname"
+                                       fi
+
+                                       group_add_user "$addngname" "$uname"
+                               done
+                               IFS="$oIFS"
+                       fi
+
+                       unset uid gid uname gname addngroups addngroup addngname addngid
                done
        fi
 }
@@ -254,7 +282,6 @@ default_postinst() {
                fi
 
                if grep -m1 -q -s "^/etc/uci-defaults/" "$filelist"; then
-                       . /lib/functions/system.sh
                        [ -d /tmp/.uci ] || mkdir -p /tmp/.uci
                        for i in $(grep -s "^/etc/uci-defaults/" "$filelist"); do
                                ( [ -f "$i" ] && cd "$(dirname $i)" && . "$i" ) && rm -f "$i"
@@ -265,7 +292,7 @@ default_postinst() {
                rm -f /tmp/luci-indexcache
        fi
 
-       local shell="$(which bash)"
+       local shell="$(command -v bash)"
        for i in $(grep -s "^/etc/init.d/" "$root$filelist"); do
                if [ -n "$root" ]; then
                        ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable
@@ -303,6 +330,25 @@ find_mtd_part() {
        echo "${INDEX:+$PREFIX$INDEX}"
 }
 
+find_mmc_part() {
+       local DEVNAME PARTNAME ROOTDEV
+
+       if grep -q "$1" /proc/mtd; then
+               echo "" && return 0
+       fi
+
+       if [ -n "$2" ]; then
+               ROOTDEV="$2"
+       else
+               ROOTDEV="mmcblk*"
+       fi
+
+       for DEVNAME in /sys/block/$ROOTDEV/mmcblk*p*; do
+               PARTNAME="$(grep PARTNAME ${DEVNAME}/uevent | cut -f2 -d'=')"
+               [ "$PARTNAME" = "$1" ] && echo "/dev/$(basename $DEVNAME)" && return 0
+       done
+}
+
 group_add() {
        local name="$1"
        local gid="$2"
@@ -324,10 +370,10 @@ group_add_next() {
                echo $gid
                return
        fi
-       gids=$(cat ${IPKG_INSTROOT}/etc/group | cut -d: -f3)
+       gids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/group)
        gid=65536
-       while [ -n "$(echo "$gids" | grep "^$gid$")" ] ; do
-               gid=$((gid + 1))
+       while echo "$gids" | grep -q "^$gid$"; do
+               gid=$((gid + 1))
        done
        group_add $1 $gid
        echo $gid
@@ -336,8 +382,8 @@ group_add_next() {
 group_add_user() {
        local grp delim=","
        grp=$(grep -s "^${1}:" ${IPKG_INSTROOT}/etc/group)
-       [ -z "$(echo $grp | cut -d: -f4 | grep $2)" ] || return
-       [ -n "$(echo $grp | grep ":$")" ] && delim=""
+       echo "$grp" | cut -d: -f4 | grep -q $2 && return
+       echo "$grp" | grep -q ":$" && delim=""
        [ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd
        sed -i "s/$grp/$grp$delim$2/g" ${IPKG_INSTROOT}/etc/group
        [ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd
@@ -352,10 +398,10 @@ user_add() {
        local shell="${6:-/bin/false}"
        local rc
        [ -z "$uid" ] && {
-               uids=$(cat ${IPKG_INSTROOT}/etc/passwd | cut -d: -f3)
+               uids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/passwd)
                uid=65536
-               while [ -n "$(echo "$uids" | grep "^$uid$")" ] ; do
-                       uid=$((uid + 1))
+               while echo "$uids" | grep -q "^$uid$"; do
+                       uid=$((uid + 1))
                done
        }
        [ -z "$gid" ] && gid=$uid
@@ -374,4 +420,14 @@ board_name() {
        [ -e /tmp/sysinfo/board_name ] && cat /tmp/sysinfo/board_name || echo "generic"
 }
 
-[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh
+cmdline_get_var() {
+       local var=$1
+       local cmdlinevar tmp
+
+       for cmdlinevar in $(cat /proc/cmdline); do
+               tmp=${cmdlinevar##${var}}
+               [ "=" = "${tmp:0:1}" ] && echo ${tmp:1}
+       done
+}
+
+[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh