head	1.8;
access;
symbols
	RELENG_8_4:1.8.0.2
	RELENG_9_1_0_RELEASE:1.6.2.1.4.2
	RELENG_9_1:1.6.2.1.0.4
	RELENG_9_1_BP:1.6.2.1
	RELENG_8_3_0_RELEASE:1.5.10.1.8.1
	RELENG_8_3:1.5.10.1.0.8
	RELENG_8_3_BP:1.5.10.1
	RELENG_9_0_0_RELEASE:1.6.2.1.2.1
	RELENG_9_0:1.6.2.1.0.2
	RELENG_9_0_BP:1.6.2.1
	RELENG_9:1.6.0.2
	RELENG_9_BP:1.6
	RELENG_7_4_0_RELEASE:1.5.14.1
	RELENG_8_2_0_RELEASE:1.5.10.1.6.1
	RELENG_7_4:1.5.0.14
	RELENG_7_4_BP:1.5
	RELENG_8_2:1.5.10.1.0.6
	RELENG_8_2_BP:1.5.10.1
	RELENG_8_1_0_RELEASE:1.5.10.1.4.1
	RELENG_8_1:1.5.10.1.0.4
	RELENG_8_1_BP:1.5.10.1
	RELENG_7_3_0_RELEASE:1.5.12.1
	RELENG_7_3:1.5.0.12
	RELENG_7_3_BP:1.5
	RELENG_8_0_0_RELEASE:1.5.10.1.2.1
	RELENG_8_0:1.5.10.1.0.2
	RELENG_8_0_BP:1.5.10.1
	RELENG_8:1.5.0.10
	RELENG_8_BP:1.5
	RELENG_7_2_0_RELEASE:1.5.8.1
	RELENG_7_2:1.5.0.8
	RELENG_7_2_BP:1.5
	RELENG_7_1_0_RELEASE:1.5.6.1
	RELENG_6_4_0_RELEASE:1.4.8.1.8.1
	RELENG_7_1:1.5.0.6
	RELENG_7_1_BP:1.5
	RELENG_6_4:1.4.8.1.0.8
	RELENG_6_4_BP:1.4.8.1
	RELENG_7_0_0_RELEASE:1.5
	RELENG_6_3_0_RELEASE:1.4.8.1
	RELENG_7_0:1.5.0.4
	RELENG_7_0_BP:1.5
	RELENG_6_3:1.4.8.1.0.6
	RELENG_6_3_BP:1.4.8.1
	RELENG_7:1.5.0.2
	RELENG_7_BP:1.5
	RELENG_6_2_0_RELEASE:1.4.8.1
	RELENG_6_2:1.4.8.1.0.4
	RELENG_6_2_BP:1.4.8.1
	RELENG_5_5_0_RELEASE:1.4
	RELENG_5_5:1.4.0.12
	RELENG_5_5_BP:1.4
	RELENG_6_1_0_RELEASE:1.4.8.1
	RELENG_6_1:1.4.8.1.0.2
	RELENG_6_1_BP:1.4.8.1
	RELENG_6_0_0_RELEASE:1.4
	RELENG_6_0:1.4.0.10
	RELENG_6_0_BP:1.4
	RELENG_6:1.4.0.8
	RELENG_6_BP:1.4
	RELENG_5_4_0_RELEASE:1.4
	RELENG_5_4:1.4.0.6
	RELENG_5_4_BP:1.4
	RELENG_5_3_0_RELEASE:1.4
	RELENG_5_3:1.4.0.4
	RELENG_5_3_BP:1.4
	RELENG_5:1.4.0.2
	RELENG_5_BP:1.4
	RELENG_5_2_1_RELEASE:1.2
	RELENG_5_2_0_RELEASE:1.2
	RELENG_5_2:1.2.0.2
	RELENG_5_2_BP:1.2;
locks; strict;
comment	@# @;


1.8
date	2012.11.17.01.55.00;	author svnexp;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2012.11.03.18.38.28;	author delphij;	state Exp;
branches;
next	1.6;

1.6
date	2010.01.02.11.07.44;	author ed;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2005.08.24.19.28.33;	author pjd;	state Exp;
branches
	1.5.2.1
	1.5.6.1
	1.5.8.1
	1.5.10.1
	1.5.12.1
	1.5.14.1;
next	1.4;

1.4
date	2004.02.28.20.56.34;	author phk;	state Exp;
branches
	1.4.8.1;
next	1.3;

1.3
date	2004.02.23.20.21.21;	author johan;	state Exp;
branches;
next	1.2;

1.2
date	2003.07.03.03.37.04;	author smkelly;	state Exp;
branches;
next	1.1;

1.1
date	2003.06.26.09.50.52;	author smkelly;	state Exp;
branches;
next	;

1.8.2.1
date	2012.11.17.01.55.00;	author svnexp;	state dead;
branches;
next	1.8.2.2;

1.8.2.2
date	2013.03.28.13.06.28;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.6.2.1.2.1
	1.6.2.1.4.1;
next	1.6.2.2;

1.6.2.2
date	2012.11.17.11.37.48;	author svnexp;	state Exp;
branches;
next	1.6.2.3;

1.6.2.3
date	2012.12.03.18.48.43;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.6.2.1.2.2;

1.6.2.1.2.2
date	2012.11.17.08.37.45;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.6.2.1.4.2;

1.6.2.1.4.2
date	2012.11.17.08.48.37;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	2012.11.17.08.09.06;	author svnexp;	state Exp;
branches;
next	1.5.2.2;

1.5.2.2
date	2012.12.03.18.43.13;	author svnexp;	state Exp;
branches;
next	;

1.5.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.5.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.5.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.5.10.1.2.1
	1.5.10.1.4.1
	1.5.10.1.6.1
	1.5.10.1.8.1;
next	1.5.10.2;

1.5.10.2
date	2012.11.17.10.37.28;	author svnexp;	state Exp;
branches;
next	1.5.10.3;

1.5.10.3
date	2012.12.03.18.45.27;	author svnexp;	state Exp;
branches;
next	;

1.5.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.5.10.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.5.10.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.5.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.5.10.1.8.2;

1.5.10.1.8.2
date	2012.11.17.08.25.59;	author svnexp;	state Exp;
branches;
next	;

1.5.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.5.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.5.14.2;

1.5.14.2
date	2012.11.17.08.17.51;	author svnexp;	state Exp;
branches;
next	;

1.4.8.1
date	2006.01.15.17.50.38;	author delphij;	state Exp;
branches
	1.4.8.1.8.1;
next	1.4.8.2;

1.4.8.2
date	2012.11.17.07.46.47;	author svnexp;	state Exp;
branches;
next	;

1.4.8.1.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.sbin/watchdogd/Makefile 242519 2012-11-03 18:38:28Z delphij $

PROG=	watchdogd
LINKS=	${BINDIR}/watchdogd ${BINDIR}/watchdog
MAN=	watchdogd.8 watchdog.8

LDADD=	-lutil
DPADD=	${LIBUTIL}

.include <bsd.prog.mk>

test:	${PROG}
	./${PROG} -t 1.0
@


1.8.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:28 +0000
@
text
@d1 13
@


1.8.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 14
# $FreeBSD: releng/8.4/usr.sbin/watchdogd/Makefile 243821 2012-12-03 18:30:52Z delphij $

PROG=	watchdogd
LINKS=	${BINDIR}/watchdogd ${BINDIR}/watchdog
MAN=	watchdogd.8 watchdog.8
WARNS?=	6

LDADD=	-lutil
DPADD=	${LIBUTIL}

.include <bsd.prog.mk>

test:	${PROG}
	./${PROG} -t 1.0
@


1.7
log
@SVN rev 242519 on 2012-11-03 18:38:28Z by delphij

Replace log(3) with flsll(3) for watchdogd(8) and drop libm dependency.

MFC after:	2 weeks
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.6
log
@SVN rev 201390 on 2010-01-02 11:07:44Z by ed

The last big commit: let usr.sbin/ use WARNS=6 by default.
@
text
@d7 2
a8 2
LDADD=	-lm -lutil
DPADD=	${LIBM} ${LIBUTIL}
@


1.6.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.6.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/usr.sbin/watchdogd/Makefile 201390 2010-01-02 11:07:44Z ed $
@


1.6.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/243820
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r243820 | delphij | 2012-12-03 18:30:12 +0000 (Mon, 03 Dec 2012) | 4 lines
## SVN ##
## SVN ## MFC r242519:
## SVN ##
## SVN ## Replace log(3) with flsll(3) for watchdogd(8) and drop libm dependency.
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/usr.sbin/watchdogd/Makefile 243820 2012-12-03 18:30:12Z delphij $
d7 2
a8 2
LDADD=	-lutil
DPADD=	${LIBUTIL}
@


1.6.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.6.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/watchdogd/Makefile 201390 2010-01-02 11:07:44Z ed $
@


1.6.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.6.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/watchdogd/Makefile 201390 2010-01-02 11:07:44Z ed $
@


1.5
log
@Use pidfile(3) in watchdogd(8).
@
text
@a5 1
WARNS?=	6
@


1.5.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/watchdogd/Makefile 149434 2005-08-24 19:28:33Z pjd $
@


1.5.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/243822
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r243822 | delphij | 2012-12-03 18:31:33 +0000 (Mon, 03 Dec 2012) | 4 lines
## SVN ##
## SVN ## MFC r242519:
## SVN ##
## SVN ## Replace log(3) with flsll(3) for watchdogd(8) and drop libm dependency.
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/watchdogd/Makefile 243822 2012-12-03 18:31:33Z delphij $
d8 2
a9 2
LDADD=	-lutil
DPADD=	${LIBUTIL}
@


1.5.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.5.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/watchdogd/Makefile 149434 2005-08-24 19:28:33Z pjd $
@


1.5.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.5.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.5.10.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/usr.sbin/watchdogd/Makefile 149434 2005-08-24 19:28:33Z pjd $
@


1.5.10.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/243821
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r243821 | delphij | 2012-12-03 18:30:52 +0000 (Mon, 03 Dec 2012) | 4 lines
## SVN ##
## SVN ## MFC r242519:
## SVN ##
## SVN ## Replace log(3) with flsll(3) for watchdogd(8) and drop libm dependency.
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/usr.sbin/watchdogd/Makefile 243821 2012-12-03 18:30:52Z delphij $
d8 2
a9 2
LDADD=	-lutil
DPADD=	${LIBUTIL}
@


1.5.10.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.5.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.sbin/watchdogd/Makefile 149434 2005-08-24 19:28:33Z pjd $
@


1.5.10.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.5.10.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.5.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.5.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.5.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.4
log
@Rename the WATCHDOG option to SW_WATCHDOG and make it use the
generic watchdoc(9) interface.

Make watchdogd(8) perform as watchdog(8) as well, and make it
possible to specify a check command to run, timeout and sleep
periods.

Update watchdog(4) to talk about the generic interface and add
new watchdog(8) page.
@
text
@d8 2
a9 2
LDADD=	-lm
DPADD=	${LIBM}
@


1.4.8.1
log
@MFC pidfile(3) function, and convert several applications to make use
of it.

Bump __FreeBSDversion for the MFC.

Discussed with:	pjd
@
text
@d8 2
a9 2
LDADD=	-lm -lutil
DPADD=	${LIBM} ${LIBUTIL}
@


1.4.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/watchdogd/Makefile 154396 2006-01-15 17:50:38Z delphij $
@


1.4.8.1.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.3
log
@style.Makefile(5):
	Use WARNS?= instead of WARNS=.
@
text
@d4 2
a5 1
MAN=	watchdogd.8
d8 3
d12 3
@


1.2
log
@o style(9) fixes
  - Reordered #includes
  - Only include <sys/types.h>, not it and <sys/cdefs.h>
o style.Makefile(5) fixes
  - No SRCS= line when only one src file with same name as program
o Use warn()/errx() instead of fprintf()
  - Integrated patch from Philippe Charnier <charnier@@xp11.frmug.org>

Approved by:	jeff (mentor)
@
text
@d5 1
a5 1
WARNS=	6
@


1.1
log
@- Add a software watchdog facility.

This commit has two pieces. One half is the watchdog kernel code which lives
primarily in hardclock() in sys/kern/kern_clock.c. The other half is a userland
daemon which, when run, will keep the watchdog from firing while the userland
is intact and functioning.

Approved by:	jeff (mentor)
@
text
@d3 3
a5 4
PROG=  watchdogd
SRCS=  watchdogd.c
MAN=   watchdogd.8
WARNS= 6
@

