Date: Sunday, October 23, 2011 @ 10:16:24 Author: thomas Revision: 141081
archrelease: copy trunk to extra-i686, extra-x86_64 Added: watchdog/repos/extra-i686/PKGBUILD (from rev 141080, watchdog/trunk/PKGBUILD) watchdog/repos/extra-i686/watchdog-5.9-use-oom_score_adj.patch (from rev 141080, watchdog/trunk/watchdog-5.9-use-oom_score_adj.patch) watchdog/repos/extra-i686/watchdog.cf (from rev 141080, watchdog/trunk/watchdog.cf) watchdog/repos/extra-i686/watchdog.sh (from rev 141080, watchdog/trunk/watchdog.sh) watchdog/repos/extra-x86_64/PKGBUILD (from rev 141080, watchdog/trunk/PKGBUILD) watchdog/repos/extra-x86_64/watchdog-5.9-use-oom_score_adj.patch (from rev 141080, watchdog/trunk/watchdog-5.9-use-oom_score_adj.patch) watchdog/repos/extra-x86_64/watchdog.cf (from rev 141080, watchdog/trunk/watchdog.cf) watchdog/repos/extra-x86_64/watchdog.sh (from rev 141080, watchdog/trunk/watchdog.sh) Deleted: watchdog/repos/extra-i686/PKGBUILD watchdog/repos/extra-i686/watchdog.cf watchdog/repos/extra-i686/watchdog.sh watchdog/repos/extra-x86_64/PKGBUILD watchdog/repos/extra-x86_64/watchdog.cf watchdog/repos/extra-x86_64/watchdog.sh ---------------------------------------------------+ extra-i686/PKGBUILD | 91 ++++++++++---------- extra-i686/watchdog-5.9-use-oom_score_adj.patch | 91 ++++++++++++++++++++ extra-i686/watchdog.cf | 4 extra-i686/watchdog.sh | 88 +++++++++---------- extra-x86_64/PKGBUILD | 91 ++++++++++---------- extra-x86_64/watchdog-5.9-use-oom_score_adj.patch | 91 ++++++++++++++++++++ extra-x86_64/watchdog.cf | 4 extra-x86_64/watchdog.sh | 88 +++++++++---------- 8 files changed, 368 insertions(+), 180 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-10-23 14:14:56 UTC (rev 141080) +++ extra-i686/PKGBUILD 2011-10-23 14:16:24 UTC (rev 141081) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler <tho...@archlinux.org> - -pkgname=watchdog -pkgver=5.9 -pkgrel=1 -pkgdesc="Watchdog daemon" -arch=(i686 x86_64) -url="http://sourceforge.net/projects/watchdog" -license=('GPL') -depends=('glibc') -backup=(etc/watchdog.conf - etc/conf.d/watchdog - etc/conf.d/wd_keepalive) -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - watchdog.sh - watchdog.cf) -md5sums=('d7cae3c9829f5d9a680764f314234867' - '854451f554718b55186599faaa8d85f6' - '01c1e2e13f515131180b4ebe9b8b7cc3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make install DESTDIR=${pkgdir} - for fil in watchdog wd_keepalive ; do - install -D -m755 ${srcdir}/watchdog.sh ${pkgdir}/etc/rc.d/${fil} - install -D -m644 ${srcdir}/watchdog.cf ${pkgdir}/etc/conf.d/${fil} - done - - 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 - sed -i 's/Watchdog/Simple Watchdog/' ${pkgdir}/etc/rc.d/wd_keepalive -} Copied: watchdog/repos/extra-i686/PKGBUILD (from rev 141080, watchdog/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-10-23 14:16:24 UTC (rev 141081) @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgname=watchdog +pkgver=5.9 +pkgrel=2 +pkgdesc="Watchdog daemon" +arch=(i686 x86_64) +url="http://sourceforge.net/projects/watchdog" +license=('GPL') +depends=('glibc') +backup=(etc/watchdog.conf + etc/conf.d/watchdog + etc/conf.d/wd_keepalive) +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + watchdog.sh + watchdog.cf + watchdog-5.9-use-oom_score_adj.patch) +md5sums=('d7cae3c9829f5d9a680764f314234867' + '854451f554718b55186599faaa8d85f6' + '01c1e2e13f515131180b4ebe9b8b7cc3' + '9a1ab454e42a7f2969ef6bf2da8a4543') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + patch -p1 -i "${srcdir}"/watchdog-5.9-use-oom_score_adj.patch + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make install DESTDIR="${pkgdir}" + for fil in watchdog wd_keepalive ; do + install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil} + install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil} + done + + 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 + sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive +} Copied: watchdog/repos/extra-i686/watchdog-5.9-use-oom_score_adj.patch (from rev 141080, watchdog/trunk/watchdog-5.9-use-oom_score_adj.patch) =================================================================== --- extra-i686/watchdog-5.9-use-oom_score_adj.patch (rev 0) +++ extra-i686/watchdog-5.9-use-oom_score_adj.patch 2011-10-23 14:16:24 UTC (rev 141081) @@ -0,0 +1,91 @@ +diff -ur watchdog-5.9.orig/src/watchdog.c watchdog-5.9/src/watchdog.c +--- watchdog-5.9.orig/src/watchdog.c 2010-06-16 15:45:51.000000000 +0200 ++++ watchdog-5.9/src/watchdog.c 2011-10-23 15:51:58.631689778 +0200 +@@ -636,7 +636,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); ++ filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); + if (!filename_buf) { + error(progname); + exit(1); +@@ -886,11 +886,19 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); +- (void) fclose(fp); ++ fprintf(fp, "-1000\n"); ++ (void) fclose(fp); ++ } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } + } + + /* main loop: update after <tint> seconds */ +diff -ur watchdog-5.9.orig/src/wd_keepalive.c watchdog-5.9/src/wd_keepalive.c +--- watchdog-5.9.orig/src/wd_keepalive.c 2010-06-16 15:45:49.000000000 +0200 ++++ watchdog-5.9/src/wd_keepalive.c 2011-10-23 15:50:43.061563281 +0200 +@@ -212,7 +212,7 @@ + FILE *fp; + char *configfile = CONFIG_FILENAME; + char *filename_buf; +- pid_t child_pid; ++ pid_t pid, child_pid; + int count = 0; + int c; + /* allow all options watchdog understands too */ +@@ -284,7 +284,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); ++ filename_buf = (char*)malloc(strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); + if (!filename_buf) { + error(progname); + exit(1); +@@ -363,9 +363,10 @@ + #endif + + /* tuck my process id away */ ++ pid = getpid(); + fp = fopen(KA_PIDFILE, "w"); + if ( fp != NULL ) { +- fprintf(fp, "%d\n", getpid()); ++ fprintf(fp, "%d\n", pid); + (void) fclose(fp); + } + +@@ -403,12 +404,20 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", getpid()); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); ++ fprintf(fp, "-1000\n"); + (void) fclose(fp); + } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } ++ } + + /* main loop: update after <tint> seconds */ + while ( _running ) { Deleted: extra-i686/watchdog.cf =================================================================== --- extra-i686/watchdog.cf 2011-10-23 14:14:56 UTC (rev 141080) +++ extra-i686/watchdog.cf 2011-10-23 14:16:24 UTC (rev 141081) @@ -1,2 +0,0 @@ -# watchdog configuration -WATCHDOG_OPTIONS="" Copied: watchdog/repos/extra-i686/watchdog.cf (from rev 141080, watchdog/trunk/watchdog.cf) =================================================================== --- extra-i686/watchdog.cf (rev 0) +++ extra-i686/watchdog.cf 2011-10-23 14:16:24 UTC (rev 141081) @@ -0,0 +1,2 @@ +# watchdog configuration +WATCHDOG_OPTIONS="" Deleted: extra-i686/watchdog.sh =================================================================== --- extra-i686/watchdog.sh 2011-10-23 14:14:56 UTC (rev 141080) +++ extra-i686/watchdog.sh 2011-10-23 14:16:24 UTC (rev 141081) @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$( cat /var/run/watchdog.pid 2>/dev/null )" -[ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog - -case "$1" in - start) - stat_busy "Starting Watchdog Daemon" - - [ -z "$PID" ] && /usr/sbin/watchdog ${WATCHDOG_OPTIONS} - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon watchdog - stat_done - fi - ;; - stop) - stat_busy "Stopping Watchdog Daemon" - - [ -n "$PID" ] && kill $PID &> /dev/null - - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon watchdog - stat_done - fi - - rm -f /var/run/watchdog.pid - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Copied: watchdog/repos/extra-i686/watchdog.sh (from rev 141080, watchdog/trunk/watchdog.sh) =================================================================== --- extra-i686/watchdog.sh (rev 0) +++ extra-i686/watchdog.sh 2011-10-23 14:16:24 UTC (rev 141081) @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID="$( cat /var/run/watchdog.pid 2>/dev/null )" +[ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog + +case "$1" in + start) + stat_busy "Starting Watchdog Daemon" + + [ -z "$PID" ] && /usr/sbin/watchdog ${WATCHDOG_OPTIONS} + + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon watchdog + stat_done + fi + ;; + stop) + stat_busy "Stopping Watchdog Daemon" + + [ -n "$PID" ] && kill $PID &> /dev/null + + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon watchdog + stat_done + fi + + rm -f /var/run/watchdog.pid + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-10-23 14:14:56 UTC (rev 141080) +++ extra-x86_64/PKGBUILD 2011-10-23 14:16:24 UTC (rev 141081) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler <tho...@archlinux.org> - -pkgname=watchdog -pkgver=5.9 -pkgrel=1 -pkgdesc="Watchdog daemon" -arch=(i686 x86_64) -url="http://sourceforge.net/projects/watchdog" -license=('GPL') -depends=('glibc') -backup=(etc/watchdog.conf - etc/conf.d/watchdog - etc/conf.d/wd_keepalive) -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - watchdog.sh - watchdog.cf) -md5sums=('d7cae3c9829f5d9a680764f314234867' - '854451f554718b55186599faaa8d85f6' - '01c1e2e13f515131180b4ebe9b8b7cc3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make install DESTDIR=${pkgdir} - for fil in watchdog wd_keepalive ; do - install -D -m755 ${srcdir}/watchdog.sh ${pkgdir}/etc/rc.d/${fil} - install -D -m644 ${srcdir}/watchdog.cf ${pkgdir}/etc/conf.d/${fil} - done - - 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 - sed -i 's/Watchdog/Simple Watchdog/' ${pkgdir}/etc/rc.d/wd_keepalive -} Copied: watchdog/repos/extra-x86_64/PKGBUILD (from rev 141080, watchdog/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-10-23 14:16:24 UTC (rev 141081) @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Thomas Bächler <tho...@archlinux.org> + +pkgname=watchdog +pkgver=5.9 +pkgrel=2 +pkgdesc="Watchdog daemon" +arch=(i686 x86_64) +url="http://sourceforge.net/projects/watchdog" +license=('GPL') +depends=('glibc') +backup=(etc/watchdog.conf + etc/conf.d/watchdog + etc/conf.d/wd_keepalive) +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + watchdog.sh + watchdog.cf + watchdog-5.9-use-oom_score_adj.patch) +md5sums=('d7cae3c9829f5d9a680764f314234867' + '854451f554718b55186599faaa8d85f6' + '01c1e2e13f515131180b4ebe9b8b7cc3' + '9a1ab454e42a7f2969ef6bf2da8a4543') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + patch -p1 -i "${srcdir}"/watchdog-5.9-use-oom_score_adj.patch + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make install DESTDIR="${pkgdir}" + for fil in watchdog wd_keepalive ; do + install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil} + install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil} + done + + 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 + sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive +} Copied: watchdog/repos/extra-x86_64/watchdog-5.9-use-oom_score_adj.patch (from rev 141080, watchdog/trunk/watchdog-5.9-use-oom_score_adj.patch) =================================================================== --- extra-x86_64/watchdog-5.9-use-oom_score_adj.patch (rev 0) +++ extra-x86_64/watchdog-5.9-use-oom_score_adj.patch 2011-10-23 14:16:24 UTC (rev 141081) @@ -0,0 +1,91 @@ +diff -ur watchdog-5.9.orig/src/watchdog.c watchdog-5.9/src/watchdog.c +--- watchdog-5.9.orig/src/watchdog.c 2010-06-16 15:45:51.000000000 +0200 ++++ watchdog-5.9/src/watchdog.c 2011-10-23 15:51:58.631689778 +0200 +@@ -636,7 +636,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); ++ filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); + if (!filename_buf) { + error(progname); + exit(1); +@@ -886,11 +886,19 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); +- (void) fclose(fp); ++ fprintf(fp, "-1000\n"); ++ (void) fclose(fp); ++ } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } + } + + /* main loop: update after <tint> seconds */ +diff -ur watchdog-5.9.orig/src/wd_keepalive.c watchdog-5.9/src/wd_keepalive.c +--- watchdog-5.9.orig/src/wd_keepalive.c 2010-06-16 15:45:49.000000000 +0200 ++++ watchdog-5.9/src/wd_keepalive.c 2011-10-23 15:50:43.061563281 +0200 +@@ -212,7 +212,7 @@ + FILE *fp; + char *configfile = CONFIG_FILENAME; + char *filename_buf; +- pid_t child_pid; ++ pid_t pid, child_pid; + int count = 0; + int c; + /* allow all options watchdog understands too */ +@@ -284,7 +284,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); ++ filename_buf = (char*)malloc(strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); + if (!filename_buf) { + error(progname); + exit(1); +@@ -363,9 +363,10 @@ + #endif + + /* tuck my process id away */ ++ pid = getpid(); + fp = fopen(KA_PIDFILE, "w"); + if ( fp != NULL ) { +- fprintf(fp, "%d\n", getpid()); ++ fprintf(fp, "%d\n", pid); + (void) fclose(fp); + } + +@@ -403,12 +404,20 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", getpid()); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); ++ fprintf(fp, "-1000\n"); + (void) fclose(fp); + } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } ++ } + + /* main loop: update after <tint> seconds */ + while ( _running ) { Deleted: extra-x86_64/watchdog.cf =================================================================== --- extra-x86_64/watchdog.cf 2011-10-23 14:14:56 UTC (rev 141080) +++ extra-x86_64/watchdog.cf 2011-10-23 14:16:24 UTC (rev 141081) @@ -1,2 +0,0 @@ -# watchdog configuration -WATCHDOG_OPTIONS="" Copied: watchdog/repos/extra-x86_64/watchdog.cf (from rev 141080, watchdog/trunk/watchdog.cf) =================================================================== --- extra-x86_64/watchdog.cf (rev 0) +++ extra-x86_64/watchdog.cf 2011-10-23 14:16:24 UTC (rev 141081) @@ -0,0 +1,2 @@ +# watchdog configuration +WATCHDOG_OPTIONS="" Deleted: extra-x86_64/watchdog.sh =================================================================== --- extra-x86_64/watchdog.sh 2011-10-23 14:14:56 UTC (rev 141080) +++ extra-x86_64/watchdog.sh 2011-10-23 14:16:24 UTC (rev 141081) @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$( cat /var/run/watchdog.pid 2>/dev/null )" -[ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog - -case "$1" in - start) - stat_busy "Starting Watchdog Daemon" - - [ -z "$PID" ] && /usr/sbin/watchdog ${WATCHDOG_OPTIONS} - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon watchdog - stat_done - fi - ;; - stop) - stat_busy "Stopping Watchdog Daemon" - - [ -n "$PID" ] && kill $PID &> /dev/null - - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon watchdog - stat_done - fi - - rm -f /var/run/watchdog.pid - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Copied: watchdog/repos/extra-x86_64/watchdog.sh (from rev 141080, watchdog/trunk/watchdog.sh) =================================================================== --- extra-x86_64/watchdog.sh (rev 0) +++ extra-x86_64/watchdog.sh 2011-10-23 14:16:24 UTC (rev 141081) @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID="$( cat /var/run/watchdog.pid 2>/dev/null )" +[ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog + +case "$1" in + start) + stat_busy "Starting Watchdog Daemon" + + [ -z "$PID" ] && /usr/sbin/watchdog ${WATCHDOG_OPTIONS} + + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon watchdog + stat_done + fi + ;; + stop) + stat_busy "Stopping Watchdog Daemon" + + [ -n "$PID" ] && kill $PID &> /dev/null + + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon watchdog + stat_done + fi + + rm -f /var/run/watchdog.pid + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0