diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
| commit | a420f5c4c2a4eeb411175d086b339b620dba309d (patch) | |
| tree | aa810cc98c17cf30cad06226c22f8256c056430e /extra/watchdog | |
| parent | 0ec0464a32563349252dda85e9176a9475d6fc34 (diff) | |
| parent | 81de702a6fc79e430129a7d2b708d90f43ae5ba1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vdrift/PKGBUILD
community-testing/widelands/PKGBUILD
core/cracklib/PKGBUILD
core/systemd/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/libreoffice/PKGBUILD
testing/mpfr/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
testing/yp-tools/PKGBUILD
Diffstat (limited to 'extra/watchdog')
| -rw-r--r-- | extra/watchdog/PKGBUILD | 18 | ||||
| -rw-r--r-- | extra/watchdog/watchdog.sh | 4 | ||||
| -rw-r--r-- | extra/watchdog/watchdog.systemd | 10 |
3 files changed, 24 insertions, 8 deletions
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index 2eaa31f62..c48bbde13 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 'mips64el') 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 |