[Debian-ha-commits] [pcs] 04/04: Add patch to fix conf file location on debian

[Richard Winters]

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

devrik-guest pushed a commit to branch master
in repository pcs.

commit 043239be7b746a662b8de423a14a3151055875c5
Author: Richard B Winters <rik at mmogp.com>
Date:   Sun May 3 16:40:37 2015 -0400

    Add patch to fix conf file location on debian
    
    Change-Id: I35fcba0c449885cdbfdbde52fcf16096ee70f6a9
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 .../0008-Fix-conf-directory-in-pcsd-init.patch     | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch b/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch
new file mode 100644
index 0000000..9a2a2f4
--- /dev/null
+++ b/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch
@@ -0,0 +1,38 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Sun, 3 May 2015 16:39:55 -0400
+Subject: Fix conf directory in pcsd init
+
+ - The conf file is set to be read from /etc/sysconfig/pcsd, 
+   we'll change that to be /etc/init/pcsd.conf instead
+
+Change-Id: I9a5fa9f40b5c470b35adabf4d718730a366d1a5c
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ pcsd/pcsd | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/pcsd/pcsd b/pcsd/pcsd
+index 226447a..64a35da 100755
+--- a/pcsd/pcsd
++++ b/pcsd/pcsd
+@@ -25,9 +25,10 @@
+ 
+ exec="/usr/bin/ruby"
+ prog="pcsd"
++extension=".conf"
+ config="/usr/share/pcsd"
+ 
+-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
++[ -e /etc/init/$prog$extension ] && . /etc/init/$prog$extension
+ 
+ lockfile=/var/lock/subsys/$prog
+ 
+@@ -36,7 +37,7 @@ start() {
+     echo -n $"Starting $prog: "
+     #export GEM_HOME=/usr/lib/pcsd/vendor/bundle/ruby
+     cd /var/lib/pcsd
+-    daemon --command='/usr/bin/ruby -I/usr/share/pcsd /usr/share/pcsd/ssl.rb'
++    daemon --name=pcsd --command='/usr/bin/ruby -I/usr/share/pcsd /usr/share/pcsd/ssl.rb'
+     # if not running, start it up here, usually something like "daemon $exec"
+     retval=$?
+     echo
diff --git a/debian/patches/series b/debian/patches/series
index 5c0c0a5..52efcbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch
 0006-Fix-pcsd-location-and-args-in-init-script.patch
 0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
+0008-Fix-conf-directory-in-pcsd-init.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git