diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2009-12-06 16:21:36 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2009-12-06 16:21:36 +0000 |
| commit | 0aec02cebb508b29b7b650d4f5af40f501e24a48 (patch) | |
| tree | b58fec78c615b584eb8625bfe7260c3cbbb8a33f | |
| parent | During the session's initialization, when playing the passive role, send (diff) | |
| download | wireguard-openbsd-0aec02cebb508b29b7b650d4f5af40f501e24a48.tar.xz wireguard-openbsd-0aec02cebb508b29b7b650d4f5af40f501e24a48.zip | |
Add /var/db/locate.database and /var/games/tetris.scores to IGNORE_FILES.
ok sthen@
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 34a0dcbbf16..388a443f39c 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.28 2009/08/23 20:06:32 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.29 2009/12/06 16:21:36 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: August 23 2009 $ +.Dd $Mdocdate: December 6 2009 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -149,6 +149,8 @@ The following files will always be skipped from comparison: .Pa /etc/passwd , .Pa /etc/motd , .Pa /etc/myname , +.Pa /var/db/locate.database , +.Pa /var/games/tetris.scores , .Pa /var/mail/root . .Pp The diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 07fadd9dc45..5df498a93af 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.52 2009/10/02 11:53:45 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.53 2009/12/06 16:21:36 ajacoutot Exp $ # # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> # Copyright (c) 2008, 2009 Antoine Jacoutot <ajacoutot@openbsd.org> @@ -190,7 +190,14 @@ do_populate() { done # files we don't want/need to deal with - IGNORE_FILES="/etc/*.db /etc/mail/*.db /etc/passwd /etc/motd /etc/myname /var/mail/root" + IGNORE_FILES="/etc/*.db + /etc/mail/*.db + /etc/passwd + /etc/motd + /etc/myname + /var/db/locate.database + /var/games/tetris.scores + /var/mail/root" CF_FILES="/etc/mail/localhost.cf /etc/mail/sendmail.cf /etc/mail/submit.cf" for cf in ${CF_FILES}; do CF_DIFF=`diff -q -I "##### " ${TEMPROOT}/${cf} ${DESTDIR}/${cf} 2> /dev/null` |