Resolves: 1012930

This commit is contained in:
Ales Ledvinka 2013-11-07 15:00:09 +01:00
parent fd5bf35a29
commit 6e26836f26
2 changed files with 55 additions and 21 deletions

View File

@ -1,23 +1,24 @@
diff -up ./watchdog.8.rhseldoc ./watchdog.8
--- ./watchdog.8.rhseldoc 2013-02-01 12:15:44.000000000 +0100
+++ ./watchdog.8 2013-11-07 14:22:13.048209132 +0100
@@ -216,6 +216,15 @@ a given interface for traffic. If no tra
+++ ./watchdog.8 2013-11-07 14:57:52.460258672 +0100
@@ -190,6 +190,7 @@ by
.BR watchdog .
So you can for instance restart the server from your
.IR repair-binary .
+See the Systemd section below for additinal information.
.PP
.B watchdog
will try periodically to fork itself to see whether the process
@@ -216,6 +217,8 @@ a given interface for traffic. If no tra
considered unreachable causing a soft reboot or action from the
repair binary.
.PP
+To start the watchdog when network is available:
+.PP
+.br
+systemctl disable watchdog
+.br
+systemctl enable NetworkManager-wait-online
+.br
+systemctl enable watchdog-ping
+To start the watchdog when network is available see the Systemd section below.
+.PP
.B watchdog can run an external command for user-defined tests. A return code
not equal 0 means an error occured and watchdog should react. If the external
command is killed by an uncaught signal this is considered an error by watchdog
@@ -317,6 +326,9 @@ Child process did not return in time.
@@ -317,6 +320,9 @@ Child process did not return in time.
.TP
\-10
Free for personal use.
@ -27,7 +28,7 @@ diff -up ./watchdog.8.rhseldoc ./watchdog.8
.SH "REPAIR BINARY"
The repair binary is started with one parameter: the error number that
caused
@@ -333,6 +345,9 @@ are using the real-time properties since
@@ -333,6 +339,9 @@ are using the real-time properties since
.B watchdog
will wait for
the return of this binary before proceeding.
@ -37,20 +38,52 @@ diff -up ./watchdog.8.rhseldoc ./watchdog.8
.SH "TEST DIRECTORY"
Executables placed in the test directory are discovered by watchdog on
startup and are automatically executed. They are bounded time-wise by
@@ -365,6 +380,9 @@ return a non-zero value so the machine w
@@ -365,6 +374,27 @@ return a non-zero value so the machine w
Note that the watchdog daemon may interpret and act upon any of the reserved
return codes noted in the Check Binary section prior to calling a given
command in "repair" mode.
+.SH SYSTEMD
+To start watchdog after the network is available:
+.PP
+.br
+systemctl disable watchdog
+.br
+systemctl enable NetworkManager-wait-online
+.br
+systemctl enable watchdog-ping
+.PP
+
+When using custom service pid check with custom service
+systemd unit file please be aware the "Requires="
+does dependent service deactivation.
+Using "Before=watchdog.service" or "Before=watchdog-ping.service"
+in the custom service unit file may be the desired operation instead.
+See systemd.unit documentation for more details.
+
+.SH SELINUX
+The directories /etc/watchdog.d/ and /usr/libexec/watchdog/scripts/ are
+recognized locations for custom executables.
.SH BUGS
None known so far.
.SH AUTHORS
@@ -383,4 +413,4 @@ The watchdog device.
The pid file of the running
.BR watchdog .
.SH "SEE ALSO"
-.BR watchdog.conf (5)
+.BR watchdog.conf (5), systemd.unit (5)
diff -up ./watchdog.conf.5.rhseldoc ./watchdog.conf.5
--- ./watchdog.conf.5.rhseldoc 2013-02-01 12:15:44.000000000 +0100
+++ ./watchdog.conf.5 2013-11-07 14:20:42.027278353 +0100
@@ -97,6 +97,8 @@ interfaces.
+++ ./watchdog.conf.5 2013-11-07 14:51:20.358128245 +0100
@@ -84,6 +84,7 @@ no matter what.
pidfile = <pidfilename>
Set pidfile name for server test mode.
This option can be given as often as you like to check several servers.
+See the Systemd section in watchdog (8) for more information.
.TP
ping = <ip-addr>
Set IP address for ping mode.
@@ -97,6 +98,8 @@ interfaces.
.TP
test-binary = <testbin>
Execute the given binary to do some user defined tests.
@ -59,7 +92,7 @@ diff -up ./watchdog.conf.5.rhseldoc ./watchdog.conf.5
.TP
test-timeout = <timeout in seconds>
User defined tests may only run for <timeout> seconds. Set to 0 for unlimited.
@@ -104,6 +106,8 @@ User defined tests may only run for <tim
@@ -104,6 +107,8 @@ User defined tests may only run for <tim
repair-binary = <repbin>
Execute the given binary in case of a problem instead of shutting down the
system.
@ -68,7 +101,7 @@ diff -up ./watchdog.conf.5.rhseldoc ./watchdog.conf.5
.TP
repair-timeout = <timeout in seconds>
repair command may only run for <timeout> seconds. Set to 0 for unlimited.
@@ -122,6 +126,7 @@ Set the schedule priority for realtime m
@@ -122,6 +127,7 @@ Set the schedule priority for realtime m
.TP
test-directory = <test directory>
Set the directory to run user test/repair scripts. Default is '/etc/watchdog.d'
@ -78,7 +111,7 @@ diff -up ./watchdog.conf.5.rhseldoc ./watchdog.conf.5
log-dir = <log directory>
diff -up ./watchdog.conf.rhseldoc ./watchdog.conf
--- ./watchdog.conf.rhseldoc 2013-02-01 12:15:44.000000000 +0100
+++ ./watchdog.conf 2013-11-07 14:35:49.997934254 +0100
+++ ./watchdog.conf 2013-11-07 14:47:49.955156208 +0100
@@ -15,6 +15,8 @@
# To get the real size, check how large the pagesize is on your machine.
#min-memory = 1

View File

@ -1,7 +1,7 @@
Summary: Software and/or Hardware watchdog daemon
Name: watchdog
Version: 5.13
Release: 8%{?dist}
Release: 9%{?dist}
License: GPLv2+
URL: http://sourceforge.net/projects/watchdog/
@ -135,10 +135,11 @@ fi
%changelog
* Thu Nov 7 2013 Ales Ledvinka <aledvink@redhat.com> - 5.13-8
* Thu Nov 7 2013 Ales Ledvinka <aledvink@redhat.com> - 5.13-9
- SELinux: Add /usr/libexec/watchdog/scripts/ for test-bin and repair-bin to inherit from.
- systemd: service with network dependency for ping test
- systemd: service with network available dependency
- systemd: correct cgroup for realtime settings
- Document SELinux and systemd.
* Thu Oct 24 2013 Ales Ledvinka <aledvink@redhat.com> - 5.13-5
- SELinux: do not reopen descriptors for reading when only appending.