[Debian-ha-commits] [pcs] 02/03: Update debian/patches

[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 f30a31c2f9385a843dc15403cd9ad05e79789c44
Author: Richard B Winters <rik at mmogp.com>
Date:   Tue May 5 20:51:34 2015 -0400

    Update debian/patches
    
     - Added patch for fixing pcsd service file on Debian
     - Renamed patch 0009 to 0010
     - Updated series
    
    Change-Id: I5a65dac43a9e2ff8861617895ec8c0b41610d96b
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 .../0009-Fix-pcsd-service-file-for-Debian.patch    | 32 ++++++++++++++++++++++
 ...0010-Remove-rubygems-require-pcsd-ssl.rb.patch} |  0
 debian/patches/series                              |  3 +-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0009-Fix-pcsd-service-file-for-Debian.patch b/debian/patches/0009-Fix-pcsd-service-file-for-Debian.patch
new file mode 100644
index 0000000..0a3bc12
--- /dev/null
+++ b/debian/patches/0009-Fix-pcsd-service-file-for-Debian.patch
@@ -0,0 +1,32 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Tue, 5 May 2015 20:42:01 -0400
+Subject: Fix pcsd service file for Debian
+
+ - Updates environment configuration file location
+ - Updates ExecStart
+ - Removes conflicting options
+
+Change-Id: I01b7a147be2c63ff0f876666c47eb8fb01b193c4
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ pcsd/pcsd.service | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/pcsd/pcsd.service b/pcsd/pcsd.service
+index 5254905..36477de 100644
+--- a/pcsd/pcsd.service
++++ b/pcsd/pcsd.service
+@@ -2,11 +2,8 @@
+ Description=PCS GUI and remote configuration interface
+ 
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/pcsd
+-WorkingDirectory=/var/lib/pcsd
+-ExecStart=/usr/lib/pcsd/pcsd start
+-Type=notify
+-NotifyAccess=all
++EnvironmentFile=/etc/default/pcsd.conf
++ExecStart=/usr/bin/ruby -C/var/lib/pcsd -I/usr/share/pcsd -- /usr/share/pcsd/ssl.rb & > /dev/null &
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/debian/patches/0009-Remove-rubygems-require-pcsd-ssl.rb.patch b/debian/patches/0010-Remove-rubygems-require-pcsd-ssl.rb.patch
similarity index 100%
rename from debian/patches/0009-Remove-rubygems-require-pcsd-ssl.rb.patch
rename to debian/patches/0010-Remove-rubygems-require-pcsd-ssl.rb.patch
diff --git a/debian/patches/series b/debian/patches/series
index ea0fbc8..1d0195a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,5 @@
 0006-Change-pcsd-destination-to-usr-share.patch
 0007-Fix-check-for-systemctl-on-Debian.patch
 0008-Do-not-install-upstream-pcsd-init-script.patch
-0009-Remove-rubygems-require-pcsd-ssl.rb.patch
+0009-Fix-pcsd-service-file-for-Debian.patch
+0010-Remove-rubygems-require-pcsd-ssl.rb.patch

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