X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/dbfb36880475206561f55dd8a65be3d379edbef0..ecce58569435cfcd625d4510dc990d35b28e0276:/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 43ce60ee1..b3e406cba 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -27,7 +27,7 @@ append() { local var="$1" local value="$2" local sep="${3:- }" - + eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\"" } @@ -74,7 +74,7 @@ package() { config () { local cfgtype="$1" local name="$2" - + export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1)) name="${name:-cfg$CONFIG_NUM_SECTIONS}" append CONFIG_SECTIONS "$name" @@ -110,7 +110,7 @@ config_rename() { 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 @@ -119,7 +119,7 @@ config_rename() { 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" } @@ -135,8 +135,8 @@ config_clear() { export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}" for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \ - sed -e 's/\(.*\)=.*$/\1/'` ; do - unset $oldvar + sed -e 's/\(.*\)=.*$/\1/'` ; do + unset $oldvar done } @@ -178,7 +178,7 @@ config_foreach() { local type="$1" [ "$#" -ge 1 ] && shift local section cfgtype - + [ -z "$CONFIG_SECTIONS" ] && return 0 for section in ${CONFIG_SECTIONS}; do config_get cfgtype "$section" TYPE @@ -214,7 +214,7 @@ load_modules() { include() { local file - + for file in $(ls $1/*.sh 2>/dev/null); do . $file done @@ -223,7 +223,7 @@ include() { find_mtd_part() { local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')" local PREFIX=/dev/mtdblock - + PART="${PART##mtd}" [ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/ echo "${PART:+$PREFIX$PART}" @@ -275,117 +275,40 @@ uci_apply_defaults() { uci commit } -# -# service: simple wrapper around start-stop-daemon -# -# Usage: service ACTION EXEC ARGS... -# -# Action: -# -C check if EXEC is alive -# -S start EXEC, passing it ARGS as its arguments -# -K kill EXEC, sending it a TERM signal if not specified otherwise -# -# Environment variables exposed: -# SERVICE_DAEMONIZE run EXEC in background -# SERVICE_WRITE_PID create a pid file and use it -# SERVICE_USE_PID assume EXEC creates its own pid file and use it -# SERVICE_PID_FILE pid file to use (default to /var/run/EXEC.pid) -# SERVICE_SIG signal to send when using -K -# SERVICE_SIG_RELOAD default signal used for reloading -# SERVICE_SIG_STOP default signal used for stopping -# SERVICE_STOP_TIME time to wait for a process to stop gracefully before killing it -# SERVICE_UID user EXEC should be run as -# SERVICE_GID group EXEC should be run as -# -# SERVICE_DEBUG don't do anything, but show what would be done -# SERVICE_QUIET don't print anything -# - -SERVICE_QUIET=1 -SERVICE_SIG_RELOAD="HUP" -SERVICE_SIG_STOP="TERM" -SERVICE_STOP_TIME=5 - -service() { - local ssd - ssd="${SERVICE_DEBUG:+echo }start-stop-daemon${SERVICE_QUIET:+ -q}" - case "$1" in - -C) - ssd="$ssd -K -t" - ;; - -S) - ssd="$ssd -S${SERVICE_DAEMONIZE:+ -b}${SERVICE_WRITE_PID:+ -m}" - ;; - -K) - ssd="$ssd -K${SERVICE_SIG:+ -s $SERVICE_SIG}" - ;; - *) - echo "ssd: unknow action '$1'" 1>&2 - return 1 - esac - shift - if [ -z "$1" ]; then - echo "ssd: missing arguments" 1>&2 - return 1 - fi - ssd="$ssd -x $1" - if [ -n "$SERVICE_PID_FILE$SERVICE_USE_PID$SERVICE_WRITE_PID" ]; then - ssd="$ssd -p ${SERVICE_PID_FILE:-/var/run/${1##*/}.pid}" - fi - ssd="$ssd${SERVICE_UID:+ -c $SERVICE_UID${SERVICE_GID:+:$SERVICE_GID}}" - shift - $ssd${1:+ -- "$@"} -} - -service_check() { - service -C "$@" -} - -service_signal() { - SERVICE_SIG="${SERVICE_SIG:-USR1}" service -K "$@" +group_add() { + local name="$1" + local gid="$2" + local rc + [ -f "${IPKG_INSTROOT}/etc/group" ] || return 1 + [ -n "$IPKG_INSTROOT" ] || lock /var/lock/group + echo "${name}:x:${gid}:" >> ${IPKG_INSTROOT}/etc/group + rc=$? + [ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/group + return $rc } -service_start() { - service -S "$@" +group_exists() { + grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/group } -service_stop() { - local try - SERVICE_SIG="${SERVICE_SIG:-$SERVICE_SIG_STOP}" service -K "$@" || return 1 - while [ $((try++)) -lt $SERVICE_STOP_TIME ]; do - service -C "$@" || return 0 - sleep 1 - done - SERVICE_SIG="KILL" service -K "$@" - sleep 1 - ! service -C "$@" -} - -service_reload() { - SERVICE_SIG="${SERVICE_SIG:-$SERVICE_SIG_RELOAD}" service -K "$@" -} - -service_kill() { - cat 1>&2 << __END_OF_WARNING__ -# -# WARNING: the 'service_kill' function is now deprecated and might be -# removed soon. Consider using the other new service_* wrappers instead. -# -__END_OF_WARNING__ +user_add() { local name="${1}" - local pid="${2:-$(pidof "$name")}" - local grace="${3:-5}" - - [ -f "$pid" ] && pid="$(head -n1 "$pid" 2>/dev/null)" - - for pid in $pid; do - [ -d "/proc/$pid" ] || continue - local try=0 - kill -TERM $pid 2>/dev/null && \ - while grep -qs "$name" "/proc/$pid/cmdline" && [ $((try++)) -lt $grace ]; do sleep 1; done - kill -KILL $pid 2>/dev/null && \ - while grep -qs "$name" "/proc/$pid/cmdline"; do sleep 1; done - done + local uid="${2}" + local gid="${3:-$2}" + local desc="${4:-$1}" + local home="${5:-/var/run/$1}" + local shell="${6:-/bin/false}" + local rc + [ -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 + rc=$? + [ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd + return $rc +} + +user_exists() { + grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/passwd }