[Debian-ha-commits] [sbd] 01/01: debian/install: include sbd_remote.service

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository sbd.

commit 041c5eafcb5a701bfad30e29d5de83c0c9441938
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Sun Jul 23 12:21:18 2017 +0200

    debian/install: include sbd_remote.service
---
 debian/patches/sbd-service_sysconfig-vs-default.patch | 11 +++++++++++
 debian/patches/sbd.service.in-kill-path               | 11 +++++++++++
 debian/sbd.install                                    |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/patches/sbd-service_sysconfig-vs-default.patch b/debian/patches/sbd-service_sysconfig-vs-default.patch
index a4b9e24..0baa1bf 100644
--- a/debian/patches/sbd-service_sysconfig-vs-default.patch
+++ b/debian/patches/sbd-service_sysconfig-vs-default.patch
@@ -10,3 +10,14 @@ Change defaults directory from sysconfig to default.
  ExecStart=@sbindir@/sbd $SBD_OPTS -p @localstatedir@/run/sbd.pid watch 
  ExecStop=/bin/kill -TERM $MAINPID
  
+--- a/src/sbd_remote.service.in
++++ b/src/sbd_remote.service.in
+@@ -8,7 +8,7 @@
+ [Service]
+ Type=forking
+ PIDFile=/var/run/sbd.pid
+-EnvironmentFile=-/etc/sysconfig/sbd
++EnvironmentFile=-/etc/default/sbd
+ ExecStart=/usr/sbin/sbd $SBD_OPTS -p /var/run/sbd.pid watch
+ ExecStop=/bin/kill -TERM $MAINPID
+ 
diff --git a/debian/patches/sbd.service.in-kill-path b/debian/patches/sbd.service.in-kill-path
index dcb0909..eb5a17b 100644
--- a/debian/patches/sbd.service.in-kill-path
+++ b/debian/patches/sbd.service.in-kill-path
@@ -9,3 +9,14 @@
  
  # Could this benefit from exit codes for restart?
  # Does this need to be set to msgwait * 1.2?
+--- a/src/sbd_remote.service.in
++++ b/src/sbd_remote.service.in
+@@ -10,7 +10,7 @@
+ PIDFile=/var/run/sbd.pid
+ EnvironmentFile=-/etc/sysconfig/sbd
+ ExecStart=/usr/sbin/sbd $SBD_OPTS -p /var/run/sbd.pid watch
+-ExecStop=/usr/bin/kill -TERM $MAINPID
++ExecStop=/bin/kill -TERM $MAINPID
+ 
+ # Could this benefit from exit codes for restart?
+ # Does this need to be set to msgwait * 1.2?
diff --git a/debian/sbd.install b/debian/sbd.install
index ed218ee..e8d20b7 100755
--- a/debian/sbd.install
+++ b/debian/sbd.install
@@ -2,3 +2,4 @@
 debian/sbd.default => /etc/default/sbd
 src/sbd.sh => /etc/init.d/sbd
 src/sbd.service /lib/systemd/system/
+src/sbd_remote.service /lib/systemd/system/

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