[Debian-ha-commits] [pcs] 02/04: Add patch to fix daemon args and location of pcsd in init script

[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 62b803295482c4e20e477fd16878b88fbbbb09ae
Author: Richard B Winters <rik at mmogp.com>
Date:   Sun May 3 15:12:13 2015 -0400

    Add patch to fix daemon args and location of pcsd in init script
    
    Change-Id: I4e5a8fa7e56109c316ba12ed972da236ea2bb34e
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 ...Fix-pcsd-location-and-args-in-init-script.patch | 48 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 49 insertions(+)

diff --git a/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch b/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch
new file mode 100644
index 0000000..5d8118c
--- /dev/null
+++ b/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch
@@ -0,0 +1,48 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Sun, 3 May 2015 15:11:35 -0400
+Subject: Fix pcsd location and args in init script
+
+ - pcsd on debian lives at /usr/share/pcsd, not /usr/lib/pcsd
+
+Change-Id: I966db71f32256689a16310bbf0c6407a00abdf68
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ pcsd/pcsd | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/pcsd/pcsd b/pcsd/pcsd
+index b2c385d..226447a 100755
+--- a/pcsd/pcsd
++++ b/pcsd/pcsd
+@@ -7,8 +7,8 @@
+ 
+ ### BEGIN INIT INFO
+ # Provides: pcsd
+-# Required-Start: $network $syslog
+-# Required-Stop: $network $syslog
++# Required-Start: $remote_fs $network $syslog
++# Required-Stop: $remote_fs $network $syslog
+ # Should-Start: 
+ # Should-Stop: 
+ # Default-Start:
+@@ -25,7 +25,7 @@
+ 
+ exec="/usr/bin/ruby"
+ prog="pcsd"
+-config="/var/lib/pcsd"
++config="/usr/share/pcsd"
+ 
+ [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+ 
+@@ -34,9 +34,9 @@ lockfile=/var/lock/subsys/$prog
+ start() {
+     [ -x $exec ] || exit 5
+     echo -n $"Starting $prog: "
+-    export GEM_HOME=/usr/lib/pcsd/vendor/bundle/ruby
++    #export GEM_HOME=/usr/lib/pcsd/vendor/bundle/ruby
+     cd /var/lib/pcsd
+-    daemon $exec -I/usr/lib/pcsd /usr/lib/pcsd/ssl.rb
++    daemon --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 0474da8..5b9fd75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Remove-build_gems-from-install_pcsd.patch
 0004-Source-lsb-init-functions.patch
 0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch
+0006-Fix-pcsd-location-and-args-in-init-script.patch

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