~ubuntu-branches/ubuntu/precise/corosync/precise-proposed

« back to all changes in this revision

Viewing changes to init/generic.in

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2010-07-02 01:24:53 UTC
  • mfrom: (1.1.4 upstream) (5.1.9 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100702012453-qky79tg6hjly2dmq
Tags: 1.2.1-1ubuntu1
* Merge from debian unstable (LP: #600900). Remaining changes:
  - Raised consensus time out to 5000ms
  - debian/control, debian/rules: Removing now-unnecessary quilt build-dep

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
        [ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/$prog"
63
63
fi
64
64
 
 
65
# The version of __pids_pidof in /etc/init.d/functions calls pidof with -x
 
66
# This means it matches scripts, including this one.
 
67
# Redefine it here so that status (from the same file) works.
 
68
# Otherwise simultaneous calls to stop() will loop forever
 
69
__pids_pidof() {
 
70
        pidof -c -o $$ -o $PPID -o %PPID "$1" || \
 
71
                pidof -c -o $$ -o $PPID -o %PPID "${1##*/}"
 
72
}
 
73
 
65
74
start()
66
75
{
67
76
        echo -n "Starting $desc ($prog): "