Ignore:
Timestamp:
09/20/2021 07:37:34 AM (3 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
multilib
Children:
60870bc
Parents:
e680022 (diff), 7e62bbc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge upstream

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bootscripts/lfs/lib/services/init-functions

    re680022 r716db1f  
    11#!/bin/sh
    22########################################################################
    3 # 
     3#
    44# Begin /lib/lsb/init-funtions
    55#
     
    155155        fi
    156156
    157         # Return a value ONLY 
     157        # Return a value ONLY
    158158        # It is the init script's (or distribution's functions) responsibilty
    159159        # to log messages!
     
    161161
    162162            0)
    163                 # Program is already running correctly, this is a 
     163                # Program is already running correctly, this is a
    164164                # successful start.
    165165                return 0
     
    231231                shift 2
    232232                ;;
    233  
     233
    234234             *)
    235235                 program="${1}"
     
    244244                 if [ -n "${3}" ]; then
    245245                     return 2
    246                  else 
     246                 else
    247247                     break
    248                  fi                 
     248                 fi
    249249                 ;;
    250250        esac
     
    322322    if [ "${?}" -eq "0" ]; then # Signal is used to terminate the program
    323323
    324         # Account for empty pidlist (pid file still exists and no 
     324        # Account for empty pidlist (pid file still exists and no
    325325        # signal was given)
    326326        if [ "${pidlist}" != "" ]; then
     
    337337                    kill "${signal}" "${pid}" 2> /dev/null
    338338
    339                     # Wait up to ${delay}/10 seconds to for "${pid}" to 
     339                    # Wait up to ${delay}/10 seconds to for "${pid}" to
    340340                    # terminate in 10ths of a second
    341341
     
    434434        prefix=`echo "${program}" | sed 's/[^/]*$//'`
    435435
    436         if [ -z "${prefix}" ]; then 
     436        if [ -z "${prefix}" ]; then
    437437           progname="${program}"
    438438        else
     
    584584    timespec
    585585    /bin/echo -e "${STAMP} ${logmessage} OK" >> ${BOOTLOG}
    586    
     586
    587587    return 0
    588588}
     
    594594
    595595    echo " OK" >> ${BOOTLOG}
    596    
     596
    597597    return 0
    598598}
     
    619619    logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
    620620    /bin/echo -e "${STAMP} ${logmessage} FAIL" >> ${BOOTLOG}
    621    
     621
    622622    return 0
    623623}
     
    629629
    630630    echo "FAIL" >> ${BOOTLOG}
    631    
     631
    632632    return 0
    633633}
     
    651651    timespec
    652652    /bin/echo -e "${STAMP} ${logmessage} WARN" >> ${BOOTLOG}
    653    
     653
    654654    return 0
    655655}
     
    663663    logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
    664664    /bin/echo "SKIP" >> ${BOOTLOG}
    665    
     665
    666666    return 0
    667667}
     
    684684    timespec
    685685    /bin/echo -n -e "${STAMP} ${logmessage}" >> ${BOOTLOG}
    686    
     686
    687687    return 0
    688688}
     
    695695    logmessage=`echo "${@}" | sed 's/\\\033[^a-zA-Z]*.//g'`
    696696    /bin/echo -n -e "${logmessage}" >> ${BOOTLOG}
    697    
     697
    698698    return 0
    699699}
Note: See TracChangeset for help on using the changeset viewer.