diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2013-09-10 08:44:38 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2013-09-10 08:44:38 +0000 |
| commit | 6f77feb4e17c0f8be491bb5bfe11d0cbc4f4c8a9 (patch) | |
| tree | 0ec8dc7c1725e5e9d7f3769a8ef9370c401e6b2e /usr.sbin/sysmerge/sysmerge.8 | |
| parent | Document that wildcards can also be used when deleting communities. (diff) | |
| download | wireguard-openbsd-6f77feb4e17c0f8be491bb5bfe11d0cbc4f4c8a9.tar.xz wireguard-openbsd-6f77feb4e17c0f8be491bb5bfe11d0cbc4f4c8a9.zip | |
Add support for the SM_PATH environment variable. This changes the
default behavior of sysmerge when no source is specified on the
command line:
* if SM_PATH is set, then sysmerge will search this path for etcXX.tgz
and/or xetcXX.tgz
* if SM_PATH is not set (the default), then the behaviour is the same
as before and /usr/src is used
idea from espie@
man page refactoring jmc@ (who else :-))
"good idea" krw@
ok rpe@ landry@ espie@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 01c6d3401c9..f237a05e2db 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.39 2013/07/16 11:13:34 schwarze Exp $ +.\" $OpenBSD: sysmerge.8,v 1.40 2013/09/10 08:44:38 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: July 16 2013 $ +.Dd $Mdocdate: September 10 2013 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -51,9 +51,6 @@ The reference files are created from a source tree or a .Dq .tgz release or snapshot file. -The default, if no source is specified on the command line, -is to use -.Pa /usr/src . All work is done under .Pa ${TMPDIR}/sysmerge.XXXXXXXXXX (known as the @@ -65,6 +62,15 @@ Each modified and/or replaced file is saved under the .Pa backup directory inside the work directory. .Pp +If no source is specified on the command line, +.Nm +uses ${FETCH_CMD} to fetch the required sets from the URI pointed +to by the +.Ev SM_PATH +environment variable, and falls back to +.Pa /usr/src +if this variable is unset. +.Pp 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 @@ -221,6 +227,9 @@ Log summary which may contain information for further, manual, updating. Defaults to .Pa ${WRKDIR}/sysmerge.log . +.It Ev SM_PATH +A URI, specifying the directory to search for sets if none are specified +on the command line. .It Ev TMPDIR Directory in which the work directory is created. If unset, this defaults to |