diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2007-04-18 17:25:48 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-04-18 17:25:48 +0000 |
| commit | 73ba84f47f745e2bf8be4f5931dd800ca42318a8 (patch) | |
| tree | a90068f1e1bd1b14552251d9be43a9302ee6b924 | |
| parent | Make start-stop-daemon get the correct state of the watchdog. (diff) | |
| download | gentoo-vdr-scripts-73ba84f47f745e2bf8be4f5931dd800ca42318a8.tar.gz gentoo-vdr-scripts-73ba84f47f745e2bf8be4f5931dd800ca42318a8.tar.bz2 gentoo-vdr-scripts-73ba84f47f745e2bf8be4f5931dd800ca42318a8.zip | |
Also stop watchdog if it was disabled while vdr was still running.
svn path=/gentoo-vdr-scripts/trunk/; revision=444
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | usr/share/vdr/inc/rc-functions.sh | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -3,6 +3,10 @@ 18 Apr 2007; Matthias Schwarzott <zzam@gentoo.org> usr/share/vdr/inc/rc-functions.sh: + Also stop watchdog if it was disabled while vdr was still running. + + 18 Apr 2007; Matthias Schwarzott <zzam@gentoo.org> + usr/share/vdr/inc/rc-functions.sh: Make start-stop-daemon get the correct state of the watchdog. 17 Apr 2007; Matthias Schwarzott <zzam@gentoo.org> diff --git a/usr/share/vdr/inc/rc-functions.sh b/usr/share/vdr/inc/rc-functions.sh index 3bb06eb..c368148 100644 --- a/usr/share/vdr/inc/rc-functions.sh +++ b/usr/share/vdr/inc/rc-functions.sh @@ -211,8 +211,11 @@ wait_for_multiple_condition() { stop_watchdog() { if [ "${ENABLE_EXTERNAL_WATCHDOG}" = "yes" ]; then ebegin "Stopping vdr watchdog" - start-stop-daemon --stop --pidfile /var/run/vdrwatchdog.pid + start-stop-daemon --stop --pidfile /var/run/vdrwatchdog.pid --name vdr-watchdogd eend $? "failed stopping watchdog" + else + # Also stop watchdog if conf was changed to disabled while it was running + start-stop-daemon --stop --pidfile /var/run/vdrwatchdog.pid --name vdr-watchdogd --quiet fi } |