diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-06-09 23:11:02 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-06-09 23:11:02 +0000 |
| commit | 83662fb96f65566b6b294030fd71876b664cfd38 (patch) | |
| tree | 92dda83fa2af3c23cec74780cc4ff9ab439a0042 /usr.sbin/sysmerge/sysmerge.8 | |
| parent | ed38349a6154d283c7f4d8666c2accc69d917436 (diff) | |
- encourage people to use the same source as was used to upgrade system
binaries so that some etc files don't get forgotten in the process
discussed with kurt@
tweaks and ok jmc@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 13a3867ca28..580f2f9727a 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.5 2008/06/01 15:07:00 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.6 2008/06/09 23:11:01 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: June 1 2008 $ +.Dd $Mdocdate: June 9 2008 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -58,6 +58,12 @@ release or snapshot file. The default, if no source is specified on the command line, is to use .Pa /usr/src . +To make sure configuration files are in sync with the actual binaries, +use the same source as was used to upgrade the system: +.Pa /usr/src +when upgrading from source and +.Pa etcXX.tgz +when upgrading from binary sets. All work is done under .Pa ${TMPDIR}/sysmerge.XXXXX (known as the |