X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Flsb-functions;h=4dc84413977baa621afe1a8e7a91b4afbda5f1c0;hb=2ee956e32f096610359390efe08ac442c470aa23;hp=42e89fb21fb04c4445211133021868721067a18a;hpb=fcb1f5a4c443b8c2e2ba359170dd8bb88a899fdb;p=grml-etc-core.git diff --git a/etc/grml/lsb-functions b/etc/grml/lsb-functions index 42e89fb..4dc8441 100644 --- a/etc/grml/lsb-functions +++ b/etc/grml/lsb-functions @@ -1,5 +1,6 @@ # lsb init-functions -# vim:ft=sh:tw=80 +# +# based on: # /lib/lsb/init-functions for Debian -*- shell-script -*- # # Copyright (c) 2002-03 Chris Lawrence @@ -29,6 +30,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +if [ "$(cat /proc/1/comm 2>/dev/null)" = "systemd" ] ; then + SYSTEMD=true +else + SYSTEMD=false +fi + +# log_*() functions {{{ TPUT="${TPUT:-"/usr/bin/tput"}" _have_tput() { @@ -100,12 +108,12 @@ log_end_msg() { if _have_tput ; then COLS="$("$TPUT" cols)" if [ -n "$COLS" ]; then - COL=$(( "$COLS" - 7 )) + COL=$(( $COLS - 7 )) else COL=73 fi UP="$("$TPUT" cuu1)" - END="$("$TPUT" hpa $COL)" + END="$("$TPUT" hpa "$COL")" START="$("$TPUT" hpa 0)" #RED="$("$TPUT" setaf 1)" #NORMAL="$("$TPUT" op)" @@ -123,120 +131,112 @@ log_end_msg() { fi return "$1" } - -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-src/rc-scripts/sbin/functions.sh,v 1.81.2.6 2005/05/15 20:00:31 vapier Exp $ - -RC_GOT_FUNCTIONS="yes" - -# Different types of dependencies -deptypes="need use" -# Different types of order deps -ordtypes="before after" - -# -# Internal variables -# +# }}} + +# e*() output functions {{{ +# heavily based on gentoo's functions.sh; stripped down and modified +# to match our needs. +# +# defined functions: +# ebegin() +# eend() +# eerror() +# eindent() +# einfo() +# einfon() +# eoutdent() +# esetdent() +# esyslog() +# ewarn() +# ewend() +# +# copyright 1999-2005 gentoo foundation +# distributed under the terms of the gnu general public license v2 +# $header: /var/cvsroot/gentoo-src/rc-scripts/sbin/functions.sh,v 1.81.2.6 2005/05/15 20:00:31 vapier exp $ + +# initialisation {{{ +# internal variables # Dont output to stdout? RC_QUIET_STDOUT="no" -RC_VERBOSE="${RC_VERBOSE:-no}" - -# Should we use color? -if [ -r /proc/cmdline ] ; then - grep -q ' nocolor' /proc/cmdline && RC_NOCOLOR='yes' -fi -RC_NOCOLOR="${RC_NOCOLOR:-no}" -# Can the terminal handle endcols? -RC_ENDCOL="yes" -# -# Default values for rc system -# -RC_TTY_NUMBER=11 -RC_NET_STRICT_CHECKING="no" -RC_PARALLEL_STARTUP="no" -RC_USE_CONFIG_PROFILE="yes" - -# # Default values for e-message indentation and dots -# RC_INDENTATION='' RC_DEFAULT_INDENT=2 #RC_DOT_PATTERN=' .' RC_DOT_PATTERN='' +# dont output to stdout? +rc_quiet_stdout="no" -# void get_bootconfig() -# -# Get the BOOTLEVEL and SOFTLEVEL by setting -# 'bootlevel' and 'softlevel' via kernel -# parameters. -# -get_bootconfig() { - local copt - local newbootlevel - local newsoftlevel - - for copt in $( 0 )) || (( i = RC_DEFAULT_INDENT )) - esetdent $(( ${#RC_INDENTATION} + i )) + local i="${1:-0}" + [ "$i" -gt 0 ] || i="${RC_DEFAULT_INDENT}" + esetdent $(( ${#RC_INDENTATION} + $i )) } # void eoutdent(int num) @@ -254,9 +254,9 @@ eindent() { # decrease the indent used for e-commands. # eoutdent() { - local i=$1 - (( i > 0 )) || (( i = RC_DEFAULT_INDENT )) - esetdent $(( ${#RC_INDENTATION} - i )) + local i="${1:-0}" + [ "$i" -gt 0 ] || i="${RC_DEFAULT_INDENT}" + esetdent $(( ${#RC_INDENTATION} - $i )) } # void esetdent(int num) @@ -265,9 +265,9 @@ eoutdent() { # num defaults to 0 # esetdent() { - local i=$1 - (( i < 0 )) && (( i = 0 )) - RC_INDENTATION=$(printf "%${i}s" '') + local i="${1:-0}" + [ "$i" -lt 0 ] && i=0 + RC_INDENTATION="$(printf "%${i}s" '')" } # void einfo(char* message) @@ -275,9 +275,9 @@ esetdent() { # show an informative message (with a newline) # einfo() { - einfon "$*\n" - LAST_E_CMD=einfo - return 0 + einfon "$*\n" + LAST_E_CMD=einfo + return 0 } # void einfon(char* message) @@ -285,11 +285,11 @@ einfo() { # show an informative message (without a newline) # einfon() { - [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0 - [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo - printf " ${GOOD}*${NORMAL} ${RC_INDENTATION}$*" - LAST_E_CMD=einfon - return 0 + [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0 + [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo + printf " ${GOOD}*${NORMAL} ${RC_INDENTATION}$*" + LAST_E_CMD=einfon + return 0 } # void ewarn(char* message) @@ -297,18 +297,18 @@ einfon() { # show a warning message + log it # ewarn() { - if [ "${RC_QUIET_STDOUT}" = "yes" ]; then - printf " $*\n" - else - [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo - printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*\n" - fi + if [ "${RC_QUIET_STDOUT}" = "yes" ]; then + printf " $*\n" + else + [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo + printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*\n" + fi - # Log warnings to system log - esyslog "daemon.warning" "rc-scripts" "$*" + # Log warnings to system log + esyslog "daemon.warning" "rc-scripts" "$@" - LAST_E_CMD=ewarn - return 0 + LAST_E_CMD=ewarn + return 0 } # void eerror(char* message) @@ -316,18 +316,18 @@ ewarn() { # show an error message + log it # eerror() { - if [ "${RC_QUIET_STDOUT}" = "yes" ]; then - printf " $*\n" >/dev/stderr - else - [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo - printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*\n" - fi + if [ "${RC_QUIET_STDOUT}" = "yes" ]; then + printf " $*\n" >&2 + else + [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo + printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*\n" + fi - # Log errors to system log - esyslog "daemon.err" "rc-scripts" "$*" + # Log errors to system log + esyslog "daemon.err" "rc-scripts" "$@" - LAST_E_CMD=eerror - return 0 + LAST_E_CMD=eerror + return 0 } # void ebegin(char* message) @@ -335,25 +335,25 @@ eerror() { # show a message indicating the start of a process # ebegin() { - local msg="$*" dots spaces - spaces="$(printf '%'"${#RC_DOT_PATTERN}"'s' '')" - [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0 - - if [ -n "${RC_DOT_PATTERN}" ]; then - dots=$(printf "%$(( COLS - 3 - ${#RC_INDENTATION} - ${#msg} - 7 ))s" '') - while [ "${dots#${spaces}}" != "${dots}" ] ; do - dots="${dots#${spaces}}${RC_DOT_PATTERN}" - done - msg="${msg}${dots}" - else - msg="${msg} ..." - fi - einfon "${msg}" - [ "${RC_ENDCOL}" = "yes" ] && echo - - LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) - LAST_E_CMD=ebegin - return 0 + local msg="$@" dots spaces + spaces="$(printf '%'"${#RC_DOT_PATTERN}"'s' '')" + [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0 + + if [ -n "${RC_DOT_PATTERN}" ]; then + dots="$(printf "%$(( $COLS - 3 - ${#RC_INDENTATION} - ${#msg} - 7 ))s" '')" + while [ "${dots#${spaces}}" != "${dots}" ] ; do + dots="${dots#${spaces}}${RC_DOT_PATTERN}" + done + msg="${msg}${dots}" + else + msg="${msg} ..." + fi + einfon "${msg}" + [ "${RC_ENDCOL}" = "yes" ] && echo + + LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) + LAST_E_CMD=ebegin + return 0 } # void _eend(int error, char *efunc, char* errstr) @@ -365,27 +365,27 @@ ebegin() { # script. # _eend() { - local retval=${1:-0} efunc=${2:-eerror} msg - shift 2 + local retval="${1:-0}" efunc="${2:-eerror}" msg + shift 2 - if [ "${retval}" -eq 0 ]; then - [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0 - msg="${BRACKET}[ ${GOOD}ok${BRACKET} ]${NORMAL}" - else - if [ -n "$*" ]; then - "${efunc}" "$*" - fi - msg="${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}" + if [ "${retval}" -eq 0 ]; then + [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0 + msg="${BRACKET}[ ${GOOD}ok${BRACKET} ]${NORMAL}" + else + if [ "$#" -gt 0 ] ; then + "${efunc}" "$@" fi + msg="${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}" + fi - if [ "${RC_ENDCOL}" = "yes" ]; then - printf "${ENDCOL} ${msg}\n" - else - [ "${LAST_E_CMD}" = "ebegin" ] || LAST_E_LEN=0 - printf "%$(( "${COLS}" - "${LAST_E_LEN}" - 6 ))s%b\n" '' "${msg}" - fi + if [ "${RC_ENDCOL}" = "yes" ]; then + printf "${ENDCOL} ${msg}\n" + else + [ "${LAST_E_CMD}" = "ebegin" ] || LAST_E_LEN=0 + printf "%$(( ${COLS} - ${LAST_E_LEN} - 6 ))s%b\n" '' "${msg}" + fi - return ${retval} + return "${retval}" } # void eend(int error, char* errstr) @@ -394,13 +394,13 @@ _eend() { # if error, show errstr via eerror # eend() { - local retval=${1:-0} - shift + local retval="${1:-0}" + shift - _eend ${retval} eerror "$*" + _eend "${retval}" eerror "$@" - LAST_E_CMD=eend - return $retval + LAST_E_CMD=eend + return "$retval" } # void ewend(int error, char* errstr) @@ -409,182 +409,37 @@ eend() { # if error, show errstr via ewarn # ewend() { - local retval=${1:-0} - shift - - _eend ${retval} ewarn "$*" - - LAST_E_CMD=ewend - return $retval -} - -# v-e-commands honor RC_VERBOSE which defaults to no. -# The condition is negated so the return value will be zero. -veinfo() { [ "${RC_VERBOSE}" != "yes" ] || einfo "$@"; } -veinfon() { [ "${RC_VERBOSE}" != "yes" ] || einfon "$@"; } -vewarn() { [ "${RC_VERBOSE}" != "yes" ] || ewarn "$@"; } -veerror() { [ "${RC_VERBOSE}" != "yes" ] || eerror "$@"; } -vebegin() { [ "${RC_VERBOSE}" != "yes" ] || ebegin "$@"; } -veend() { - [ "${RC_VERBOSE}" = "yes" ] && { eend "$@"; return $?; } - return ${1:-0} -} -veend() { - [ "${RC_VERBOSE}" = "yes" ] && { ewend "$@"; return $?; } - return ${1:-0} -} - -# bool get_bootparam(param) -# -# return 0 if gentoo=param was passed to the kernel -# -# EXAMPLE: if get_bootparam "nodevfs" ; then .... -# -get_bootparam() { - local x copt params retval=1 - - [ ! -r "/proc/cmdline" ] && return 1 - - for copt in $(< /proc/cmdline) - do - if [ "${copt%=*}" = "gentoo" ] - then - params="$(gawk -v PARAMS="${copt##*=}" ' - BEGIN { - split(PARAMS, nodes, ",") - for (x in nodes) - print nodes[x] - }')" - - # Parse gentoo option - for x in ${params} - do - if [ "${x}" = "$1" ] - then -# printf "YES\n" - retval=0 - fi - done - fi - done - - return ${retval} -} - -# char *add_suffix(char * configfile) -# -# Returns a config file name with the softlevel suffix -# appended to it. For use with multi-config services. -add_suffix() { - if [ "${RC_USE_CONFIG_PROFILE}" = "yes" -a -e "$1.${DEFAULTLEVEL}" ] - then - printf "$1.${DEFAULTLEVEL}\n" - else - printf "$1\n" - fi - - return 0 -} - -# bool get_mount_fstab(path) -# -# return the parameters to pass to the mount command generated from fstab -# -# EXAMPLE: cmd=$( get_mount_fstab /proc ) -# cmd=${cmd:--t proc none /proc} -# mount -n ${cmd} -# -get_mount_fstab() { - awk '$1 ~ "^#" { next } - $2 == "'$*'" { if (found++ == 0) { print "-t "$3,"-o "$4,$1,$2 } } - END { if (found > 1) { print "More than one entry for '$*' found in /etc/fstab!" > "/dev/stderr" } } - ' /etc/fstab -} - -# char *reverse_list(list) -# -# Returns the reversed order of list -# -reverse_list() { - local ret - ret='' - while [ "$#" -gt 0 ] ; do - if [ -z "${ret}" ] ; then - ret="$1" - else - ret="$1 ${ret}" - fi - shift - done - printf '%s' "${ret}" -} + local retval="${1:-0}" + shift + _eend "${retval}" ewarn "$@" -# bool is_older_than(reference, files/dirs to check) -# -# return 0 if any of the files/dirs are newer than -# the reference file -# -# EXAMPLE: if is_older_than a.out *.o ; then ... -is_older_than() { - local x - local ref="$1" - shift - - for x in "$@" ; do - [ "${x}" -nt "${ref}" ] && return 0 - - if [ -d "${x}" ] ; then - is_older_than "${ref}" "${x}"/* && return 0 - fi - done - - return 1 + LAST_E_CMD=ewend + return "$retval" } - -# Setup a basic $PATH. Just add system default to existing. -# This should solve both /sbin and /usr/sbin not present when -# doing 'su -c foo', or for something like: PATH= rcscript start -PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/sbin:${PATH}" - -if [ "$(/sbin/consoletype 2> /dev/null)" = "serial" ] ; then - # We do not want colors/endcols on serial terminals - RC_NOCOLOR="yes" - RC_ENDCOL="no" -fi - -for arg in "$@" ; do - case "${arg}" in - # Lastly check if the user disabled it with --nocolor argument - --nocolor|-nc) - RC_NOCOLOR="yes" - ;; - esac -done - -# Setup COLS and ENDCOL so eend can line up the [ ok ] -# width of [ ok ] == 7 -COLS="$(stty size 2>/dev/null | cut -d' ' -f2)" -if [ -z "${COLS}" ] || [ "${COLS}" -le 0 ] ; then - COLS=80 +#}}} + +# if we're using systemd then redfine functions for +# output in systemd style +if $SYSTEMD ; then + einfo() { + printf "[ ${GREEN}OK${NORMAL} ] %s\n" "$*" + } + + ewarn() { + printf "[ ${YELLOW}WARN${NORMAL} ] %s\n" "$*" + } + + eerror() { + printf "[ ${RED}FAIL${NORMAL} ] %s\n" "$*" + } + + eend() { + : + } fi -if [ "${RC_ENDCOL}" = "yes" ]; then - ENDCOL="[$(( ${COLS} - 8 ))G" -else - ENDCOL='' -fi - -# Setup the colors so our messages all look pretty -if [ "${RC_NOCOLOR}" = "yes" ]; then - unset GOOD WARN BAD NORMAL HILITE BRACKET -else - GOOD='' - WARN='' - BAD='' - NORMAL='' - HILITE='' - BRACKET='' -fi +# don't expose unneeded local variables +unset SYSTEMD -# vim:ts=4 +# vim: ft=sh tw=80 ts=4 foldmethod=marker