summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/sysmerge')
-rw-r--r--usr.sbin/sysmerge/sysmerge.86
-rw-r--r--usr.sbin/sysmerge/sysmerge.sh3
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index 388a443f39c..d3f61952a8a 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.29 2009/12/06 16:21:36 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.30 2009/12/18 13:51:02 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: December 6 2009 $
+.Dd $Mdocdate: December 18 2009 $
.Dt SYSMERGE 8
.Os
.Sh NAME
@@ -150,6 +150,8 @@ The following files will always be skipped from comparison:
.Pa /etc/motd ,
.Pa /etc/myname ,
.Pa /var/db/locate.database ,
+.Pa /var/db/sysmerge/etcsum ,
+.Pa /var/db/sysmerge/xetcsum ,
.Pa /var/games/tetris.scores ,
.Pa /var/mail/root .
.Pp
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index 5df498a93af..ca8eeb26f63 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: sysmerge.sh,v 1.53 2009/12/06 16:21:36 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.54 2009/12/18 13:51:03 ajacoutot Exp $
#
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
# Copyright (c) 2008, 2009 Antoine Jacoutot <ajacoutot@openbsd.org>
@@ -196,6 +196,7 @@ do_populate() {
/etc/motd
/etc/myname
/var/db/locate.database
+ /var/db/sysmerge/{etc,xetc}sum
/var/games/tetris.scores
/var/mail/root"
CF_FILES="/etc/mail/localhost.cf /etc/mail/sendmail.cf /etc/mail/submit.cf"