Date: Sun, 25 Apr 2004 20:12:04 +0200 From: "Simon L. Nielsen" <simon@FreeBSD.org> To: freebsd-rc@FreeBSD.org Cc: Poul-Henning Kamp <phk@FreeBSD.org> Subject: Patch for rc.d/watchdogd Message-ID: <20040425181204.GD1130@zaphod.nitro.dk>
next in thread | raw e-mail | index | archive | help
--qp4W5+cUSnZs0RIF
Content-Type: multipart/mixed; boundary="GxcwvYAGnODwn7V8"
Content-Disposition: inline
--GxcwvYAGnODwn7V8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hello
The current watchdogd rc.d script doesn't work with hardware watchdogs
supported by watchdog(4)/watchdogd(8) since the sysctl debug.watchdog
doesn't exist for the hardware devices.
The attached patch simply removes the check for the sysctl since the
generic watchdog code is always compiled in.
Could someone commit this or approve it so I can commit it myself?
--=20
Simon L. Nielsen
FreeBSD Documentation Team
--GxcwvYAGnODwn7V8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="rc.d-watchdogd.patch"
Content-Transfer-Encoding: quoted-printable
Index: watchdogd
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/etc/rc.d/watchdogd,v
retrieving revision 1.2
diff -u -d -r1.2 watchdogd
--- watchdogd 8 Mar 2004 12:25:05 -0000 1.2
+++ watchdogd 25 Apr 2004 17:56:57 -0000
@@ -36,16 +36,7 @@
name=3D"watchdogd"
rcvar=3D"`set_rcvar`"
command=3D"/usr/sbin/${name}"
-start_precmd=3D"watchdogd_precmd"
pidfile=3D"/var/run/${name}.pid"
=20
-watchdogd_precmd()
-{
- if ! sysctl debug.watchdog >/dev/null 2>&1; then
- err 1 "Your kernel doesn't have watchdog support."
- fi
- return 0
-}
-
load_rc_config $name
run_rc_command "$1"
--GxcwvYAGnODwn7V8--
--qp4W5+cUSnZs0RIF
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)
iD8DBQFAi/90h9pcDSc1mlERAtPBAJ0SizNG2tAWRkPzxIf1sHTTvVW6hwCdFzlP
gJANKfq9+NKDk7CLjQ9pC/c=
=EKxc
-----END PGP SIGNATURE-----
--qp4W5+cUSnZs0RIF--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040425181204.GD1130>