From e5a77fe6a2fd0e3eb7d877c942959b53fdff2a0c Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 1 Sep 2012 00:41:47 +0000
Subject: Sat Sep  1 00:41:47 UTC 2012

---
 extra/watchdog/PKGBUILD         | 18 ++++++++++++------
 extra/watchdog/watchdog.sh      |  4 ++--
 extra/watchdog/watchdog.systemd | 10 ++++++++++
 3 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 extra/watchdog/watchdog.systemd

(limited to 'extra/watchdog')

diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index 4c45af820..f1c3d4986 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158941 2012-05-13 14:21:11Z thomas $
+# $Id: PKGBUILD 165803 2012-08-30 17:35:28Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=watchdog
 pkgver=5.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/watchdog"
@@ -15,11 +15,13 @@ backup=(etc/watchdog.conf
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         watchdog.sh
         watchdog.cf
-        watchdog-5.12-fix-oom-in-wd_keepalive.patch)
+        watchdog-5.12-fix-oom-in-wd_keepalive.patch
+        watchdog.systemd)
 md5sums=('cea28bea70e54f3625062bc808aef9af'
-         '854451f554718b55186599faaa8d85f6'
+         'f57d33967eb9404dd52e3c4e73795a20'
          '01c1e2e13f515131180b4ebe9b8b7cc3'
-         'c90c2686975b5254f82b3de683f1f442')
+         'c90c2686975b5254f82b3de683f1f442'
+         'a835ae5cbdbb21c19a468dedb5d734e4')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -29,7 +31,10 @@ build() {
 	--prefix=/usr \
 	--mandir=/usr/share/man \
 	--sysconfdir=/etc \
-	--localstatedir=/var
+	--localstatedir=/var \
+	--with-pidfile=/run/watchdog.pid \
+	--with-ka_pidfile=/run/wd_keepalive.pid
+  
   make
 }
 
@@ -40,6 +45,7 @@ package() {
 	install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil}
 	install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil}
   done
+  install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service
 
   sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive
   sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive
diff --git a/extra/watchdog/watchdog.sh b/extra/watchdog/watchdog.sh
index 00d5078a9..54f78454f 100644
--- a/extra/watchdog/watchdog.sh
+++ b/extra/watchdog/watchdog.sh
@@ -3,7 +3,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID="$( cat /var/run/watchdog.pid 2>/dev/null )"
+PID="$( cat /run/watchdog.pid 2>/dev/null )"
 [ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog
 
 case "$1" in
@@ -31,7 +31,7 @@ case "$1" in
       stat_done
     fi
 
-    rm -f /var/run/watchdog.pid
+    rm -f /run/watchdog.pid
     ;;
   restart)
     $0 stop
diff --git a/extra/watchdog/watchdog.systemd b/extra/watchdog/watchdog.systemd
new file mode 100644
index 000000000..57c73fb45
--- /dev/null
+++ b/extra/watchdog/watchdog.systemd
@@ -0,0 +1,10 @@
+[Unit]
+Description=Watchdog Daemon
+
+[Service]
+Type=forking
+PIDFile=/run/watchdog.pid
+ExecStart=/usr/sbin/watchdog
+
+[Install]
+WantedBy=multi-user.target
-- 
cgit v1.2.3-54-g00ecf