base-files: make postinst script run inside a subshell

[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
index 7beea0e0ef127c36a8f5e3977013f601f68b4435..7f148223f525bbfb0859f604a2abd1ed9dead936 100755 (executable)
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -84,24 +84,6 @@ list() {
        list_cb "$varname" "$*"
 }
 
-config_rename() {
-       local OLD="$1"
-       local NEW="$2"
-       local oldvar
-       local newvar
-
-       [ -n "$OLD" -a -n "$NEW" ] || return
-       for oldvar in `set | grep ^CONFIG_${OLD}_ | \
-               sed -e 's/\(.*\)=.*$/\1/'` ; do
-               newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}"
-               eval "export ${NO_EXPORT:+-n} \"$newvar=\${$oldvar}\""
-               unset "$oldvar"
-       done
-       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , $NEW ,")"
-
-       [ "$CONFIG_SECTION" = "$OLD" ] && export ${NO_EXPORT:+-n} CONFIG_SECTION="$NEW"
-}
-
 config_unset() {
        config_set "$1" "$2" ""
 }
@@ -120,8 +102,8 @@ config_get_bool() {
        local _tmp
        config_get _tmp "$2" "$3" "$4"
        case "$_tmp" in
-               1|on|true|enabled) _tmp=1;;
-               0|off|false|disabled) _tmp=0;;
+               1|on|true|yes|enabled) _tmp=1;;
+               0|off|false|no|disabled) _tmp=0;;
                *) _tmp="$4";;
        esac
        export ${NO_EXPORT:+-n} "$1=$_tmp"
@@ -178,6 +160,53 @@ insert_modules() {
        }
 }
 
+default_prerm() {
+       local name
+       name=$(echo $(basename $1) | cut -d. -f1)
+       [ -f /usr/lib/opkg/info/${name}.prerm-pkg ] && . /usr/lib/opkg/info/${name}.prerm-pkg
+       for i in `cat /usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do
+               $i disable
+               $i stop
+       done
+}
+
+default_postinst() {
+       local name rusers
+       name=$(echo $(basename $1) | cut -d. -f1)
+       [ -f ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.postinst-pkg ] && ( . ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.postinst-pkg )
+       rusers=$(grep "Require-User:" ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.control)
+       [ -n "$rusers" ] && {
+               local user group
+               for a in $(echo $rusers | sed "s/Require-User://g"); do
+                       user=""
+                       group=""
+                       for b in $(echo $a | sed "s/:/ /g"); do
+                               [ -z "$user" ] && {
+                                       user=$b
+                                       continue
+                               }
+                               [ -z "$group" ] && {
+                                       group=$b
+                                       group_add_next $b
+                                       gid=$?
+                                       user_exists $user || user_add $user "" $gid
+                                       continue
+                               }
+                               group_add_next $b
+                               group_add_user $b $user
+                       done
+               done
+       }
+       [ "$PKG_UPGRADE" = "1" ] || for i in `cat ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do
+               [ -n "${IPKG_INSTROOT}" ] && $(which bash) ${IPKG_INSTROOT}/etc/rc.common ${IPKG_INSTROOT}$i enable; \
+               [ -n "${IPKG_INSTROOT}" ] || {
+                       $i enable
+                       $i start
+               }
+       done
+       return 0
+}
+
 include() {
        local file
 
@@ -186,6 +215,13 @@ include() {
        done
 }
 
+find_mtd_index() {
+       local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
+       local INDEX="${PART##mtd}"
+
+       echo ${INDEX}
+}
+
 find_mtd_part() {
        local INDEX=$(find_mtd_index "$1")
        local PREFIX=/dev/mtdblock
@@ -210,14 +246,45 @@ group_exists() {
        grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/group
 }
 
+group_add_next() {
+       local gid gids
+       gid=$(grep -s "^${1}:" ${IPKG_INSTROOT}/etc/group | cut -d: -f3)
+       [ -n "$gid" ] && return $gid
+       gids=$(cat ${IPKG_INSTROOT}/etc/group | cut -d: -f3)
+       gid=100
+       while [ -n "$(echo $gids | grep $gid)" ] ; do
+               gid=$((gid + 1))
+       done
+       group_add $1 $gid
+       return $gid
+}
+
+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=""
+       [ -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
+}
+
 user_add() {
        local name="${1}"
        local uid="${2}"
-       local gid="${3:-$2}"
+       local gid="${3}"
        local desc="${4:-$1}"
        local home="${5:-/var/run/$1}"
        local shell="${6:-/bin/false}"
        local rc
+       [ -z "$uid" ] && {
+               uids=$(cat ${IPKG_INSTROOT}/etc/passwd | cut -d: -f3)
+               uid=100
+               while [ -n "$(echo $uids | grep $uid)" ] ; do
+                       uid=$((uid + 1))
+               done
+       }
+       [ -z "$gid" ] && gid=$uid
        [ -f "${IPKG_INSTROOT}/etc/passwd" ] || return 1
        [ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd
        echo "${name}:x:${uid}:${gid}:${desc}:${home}:${shell}" >> ${IPKG_INSTROOT}/etc/passwd