[DRE-commits] [chef] 16/17: Look for the correct process name when checking status in the init script (Closes: #677827)

[Stefano Rivera]

This is an automated email from the git hooks/post-receive script.

stefanor pushed a commit to branch master
in repository chef.

commit e9e6b9fcd5085f11145f20771bbd18987f3c6cd7
Author: Stefano Rivera <stefanor at debian.org>
Date:   Fri Jan 10 16:37:43 2014 +0200

    Look for the correct process name when checking status in the init script (Closes: #677827)
---
 debian/changelog                       |  2 ++
 debian/patches/initscript-process-name | 16 ++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fddc58c..d53834d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ chef (11.8.2-1) UNRELEASED; urgency=medium
     - Bump debhelper dependency to 8.1 for build-{arch,indep} support.
   * Update po files, and include debian/po/templates.pot.
   * Remove /var/lib/chef if empty, on uninstall (Closes: #675365)
+  * Look for the correct process name when checking status in the init script
+    (Closes: #677827)
 
  -- Stefano Rivera <stefanor at debian.org>  Thu, 09 Jan 2014 15:19:11 +0200
 
diff --git a/debian/patches/initscript-process-name b/debian/patches/initscript-process-name
new file mode 100644
index 0000000..ee7fd37
--- /dev/null
+++ b/debian/patches/initscript-process-name
@@ -0,0 +1,16 @@
+Description: The process name will be ruby, not chef-client
+Bug-Debian: http://bugs.debian.org/677827
+Author: Eric Blevins <eblevins at kmionline.com>
+Last-Updated: 2014-01-10
+
+--- a/distro/debian/etc/init.d/chef-client
++++ b/distro/debian/etc/init.d/chef-client
+@@ -49,7 +49,7 @@
+ running() {
+   [ ! -f "$PIDFILE" ] && return 1
+   pid=`cat $PIDFILE`
+-  running_pid $pid $NAME || return 1
++  running_pid $pid ruby || return 1
+   return 0
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0a49035..54eba6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove_rubygems.diff
+initscript-process-name

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/chef.git