[Debian-ha-commits] [sbd] 02/05: debian/patches: make agent use /etc/default/sbd

[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 f25b6318b191753ecde90de71ea32cecdf7f600a
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Tue Jul 25 16:25:54 2017 +0200

    debian/patches: make agent use /etc/default/sbd
---
 debian/patches/sbd-service_sysconfig-vs-default.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/debian/patches/sbd-service_sysconfig-vs-default.patch b/debian/patches/sbd-service_sysconfig-vs-default.patch
index 0baa1bf..2534b26 100644
--- a/debian/patches/sbd-service_sysconfig-vs-default.patch
+++ b/debian/patches/sbd-service_sysconfig-vs-default.patch
@@ -21,3 +21,15 @@ Change defaults directory from sysconfig to default.
  ExecStart=/usr/sbin/sbd $SBD_OPTS -p /var/run/sbd.pid watch
  ExecStop=/bin/kill -TERM $MAINPID
  
+--- a/agent/sbd
++++ b/agent/sbd
+@@ -25,6 +25,9 @@
+ 	if [ -f /etc/sysconfig/sbd ]; then
+ 		source /etc/sysconfig/sbd
+ 		sbd_device=$SBD_DEVICE
++	elif [ -f /etc/default/sbd ]; then
++		source /etc/default/sbd
++		sbd_device=$SBD_DEVICE
+ 	fi
+ fi
+ 

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