diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-08-09 12:45:03 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-08-09 12:45:03 +0000 |
| commit | f78dcb726b01bcb5784b86c7feb0f18d3b8b2b17 (patch) | |
| tree | e81906094135a77aebd6cc975757fd7f5c55b167 /usr.sbin/sysmerge/sysmerge.8 | |
| parent | sysctl.conf is an example. (diff) | |
| download | wireguard-openbsd-f78dcb726b01bcb5784b86c7feb0f18d3b8b2b17.tar.xz wireguard-openbsd-f78dcb726b01bcb5784b86c7feb0f18d3b8b2b17.zip | |
Initial support for handling configuration files from packages
(aka @sample) -- `sysmerge -p`
Worked done at g2k14.
Committing early so we have plenty of time for testing.
with help from espie@
thanks to landry@ for feedback on initial testing
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 75759ef4619..68a246b0160 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.52 2014/08/09 12:34:05 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.53 2014/08/09 12:45:03 ajacoutot Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -135,6 +135,13 @@ Diff mode. In this mode, .Nm will not take any automatic action, allowing for a full diff comparison. +.It Fl p +.Xr packages 7 +mode. +In this mode, +.Nm +will compare the default configuration files of installed packages +against their target on the system (@sample). .It Fl S Do not verify signatures for tgz sets. This option has no effect when sets aren't used. @@ -153,6 +160,13 @@ to .Xr ftp 1 . .El .Pp +The +.Fl p +option is mutually exclusive with +.Fl s +and +.Fl x . +.Pp Files and directories can be excluded from comparison by listing them in the file .Pa /etc/sysmerge.ignore , |