[Debian-ha-commits] [pcs] 03/04: Added patch to fix pcsd.conf install destination 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 fe14269aac23e1f802c50f2daa19c288515d157b
Author: Richard B Winters <rik at mmogp.com>
Date:   Sun May 3 16:25:04 2015 -0400

    Added patch to fix pcsd.conf install destination on Debian
    
    Change-Id: Ied464c4ad29c71a08c8da1321190ce4fe05dbd9f
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 ...ix-pcsd.conf-destination-in-pcsd-makefile.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch b/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
new file mode 100644
index 0000000..e382bd3
--- /dev/null
+++ b/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
@@ -0,0 +1,26 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Sun, 3 May 2015 16:24:18 -0400
+Subject: Fix pcsd.conf destination in pcsd makefile
+
+ - The default install destination for pcsd.conf is /etc/
+   sysconfig/pcsd, this needs changing on debian
+
+Change-Id: I49610e431a37da21e1b350165c98626eae1fe5c6
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 0bc1767..6cf519b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,7 @@ install_pcsd:
+ 	mkdir -p ${DESTDIR}/var/log/pcsd
+ 	mkdir -p ${DESTDIR}${PREFIX}/lib/
+ 	cp -r pcsd ${DESTDIR}${PREFIX}/lib/
+-	install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/sysconfig/pcsd
++	install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/init/pcsd.conf
+ 	install -d ${DESTDIR}/etc/pam.d
+ 	install  pcsd/pcsd.pam ${DESTDIR}/etc/pam.d/pcsd
+ 	install -m 700 -d ${DESTDIR}/var/lib/pcsd
diff --git a/debian/patches/series b/debian/patches/series
index 5b9fd75..5c0c0a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 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
+0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch

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