diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-11-26 15:52:30 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-11-26 15:52:30 +0000 |
| commit | 3fcc2ec5f11841d85e6581d0d1183377621ad09c (patch) | |
| tree | 157b9c4bff10a6d6b2f5e4bbd28f2b0a9556f5a2 /usr.sbin/sysmerge/sysmerge.8 | |
| parent | comment in Makefile, small tweak in -l test (diff) | |
| download | wireguard-openbsd-3fcc2ec5f11841d85e6581d0d1183377621ad09c.tar.xz wireguard-openbsd-3fcc2ec5f11841d85e6581d0d1183377621ad09c.zip | |
Drop sysmerge.log ; it used to be handy for batch mode but now the
console output is clear and clean in that mode.
Since /var/tmp is now a symlink to /tmp:
- directly use /tmp
- if modifications were done; at the end of the run:
- display our backup directory (in case we want to move it to survive a reboot)
- display where and what files are still left for comparison
discussed with and ok sthen@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 8e64b387f16..43eaf38db6e 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.67 2014/09/05 17:26:08 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.68 2014/11/26 15:52:30 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: September 5 2014 $ +.Dd $Mdocdate: November 26 2014 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -41,12 +41,9 @@ All work is done under .Em work directory ) which contains the temporary root directory .Pa temproot , -the -.Pa backup -directory containing modified and/or replaced files and the -.Pa sysmerge.log -run output log file. +.Pa backup +directory containing modified and/or replaced files. .Pp .Nm will work through the fileset, @@ -152,7 +149,7 @@ Specifies the pagination program to use. .It Ev TMPDIR Directory in which the work directory is created. If unset, this defaults to -.Pa /var/tmp . +.Pa /tmp . .El .Sh FILES .Bl -tag -width "${TMPDIR}/sysmerge.XXXXXXXXXX" -compact @@ -163,9 +160,6 @@ The and .Sy backup directories are created relative to this. -.It ${WRKDIR}/sysmerge.log -.Nm -log file. .It /etc/sysmerge.ignore Files and directories to ignore from comparison. .It /usr/share/sysmerge/etc.tgz |