diff options
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 5 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index f3001737f40..f5830524a10 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.48 2014/07/12 16:26:35 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.49 2014/07/13 07:12:41 ajacoutot Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 12 2014 $ +.Dd $Mdocdate: July 13 2014 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -176,6 +176,7 @@ The following files will always be skipped from comparison: .Pa /etc/myname , .Pa /var/db/locate.database , .Pa /var/db/sysmerge/etcsum , +.Pa /var/db/sysmerge/examplessum , .Pa /var/db/sysmerge/xetcsum , .Pa /var/mail/root . .Pp diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 76412c6ad7c..f997c740439 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.138 2014/07/12 22:06:11 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.139 2014/07/13 07:12:41 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -218,7 +218,7 @@ sm_populate() { /etc/motd /etc/myname /var/db/locate.database - /var/db/sysmerge/{etc,xetc}sum + /var/db/sysmerge/{etc,examples,xetc}sum /var/mail/root" CF_FILES="/etc/mail/localhost.cf /etc/mail/sendmail.cf /etc/mail/submit.cf" for cf in ${CF_FILES}; do |