Blame SOURCES/0004-watchdog-5.13-rhseldoc.patch

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