[ -r /etc/sysconfig/bootsplash ] && . /etc/sysconfig/bootsplash
# if initscript is invoked via bash, enable RedHat/Fedora compatibility
+# RC_FEDORA is "set" if enabled and "unset" when not, but it's "value" is always empty
+# this is useful for inline constructs
if [ "${BASH_VERSION+set}" = "set" ]; then
RC_LOGGING=yes
FASTRC=no
+ RC_FEDORA=
+else
+ unset RC_FEDORA || :
fi
[ "$env_upstart" ] && USE_UPSTART=$env_upstart
# Some functions to handle PLD Linux-style messages
show() {
- local text len
+ local text len time
+
+ if is_yes "$RC_UPTIME"; then
+ time=$(awk '{printf("[%8.2f] ", $1)}' /proc/uptime)
+ fi
if is_no "$FASTRC" && is_yes "$GETTEXT"; then
- text=$(nls -n "$@")
+ text=$time$(nls -n "$@")
else
- text=$(printf "$@")
+ text=$time$(printf "$@")
fi
len=${#text}
while [ $((len++)) -lt $INIT_COL ]; do
}
ok() {
- echo "$_ok"
+ echo -ne "$_ok${RC_FEDORA+\r}${RC_FEDORA-\n}"
}
started() {
}
fail() {
- echo "$_fail"
+ echo -ne "$_fail${RC_FEDORA+\r}${RC_FEDORA-\n}"
return 1
}