diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2008-06-13 00:46:57 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2008-06-13 00:46:57 +0000 |
| commit | 9f27c83c93d1f70d81124dcd35b627151034f914 (patch) | |
| tree | ab0e474a9df667fc770ea069948a2b415b3fb1d8 /usr.sbin/sysmerge/sysmerge.8 | |
| parent | - always force full file check on fbtab, login.conf, sysctl.conf and (diff) | |
| download | wireguard-openbsd-9f27c83c93d1f70d81124dcd35b627151034f914.tar.xz wireguard-openbsd-9f27c83c93d1f70d81124dcd35b627151034f914.zip | |
- add support for ignoring files and directories from comparison
through an optionnal /etc/sysmerge.ignore file
requested by many
man page tweak from jmc@
/etc/changelist addition suggested by sthen@
ok sthen@ jdixon@ jmc@ naddy@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 0620e5662c5..64078fd2926 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.7 2008/06/13 00:33:04 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.8 2008/06/13 00:46:57 ajacoutot Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -113,6 +113,10 @@ Should any problems occur, such as a failure to upgrade a file, the user will be notified and have to deal with the issue by hand. .Pp +Files and directories can be excluded from comparison +by listing them in the file +.Pa /etc/sysmerge.ignore , +each entry separated by white space or a new line. The following files will always be skipped from comparison: .Pa /etc/*.db , .Pa /etc/mail/*.db , @@ -183,6 +187,8 @@ The and .Sy backup directories are created relative to this. +.It /etc/sysmerge.ignore +Files and directories to ignore from comparison. .El .Sh SEE ALSO .Xr cap_mkdb 1 , |