diff options
| author |   sthen <sthen@openbsd.org> | 2008-07-04 15:03:45 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2008-07-04 15:03:45 +0000 |
| commit | 84fb2c9e207883e1850c27db00b20f655067582d (patch) | |
| tree | abc26439dea264ea4b67cec5fd819e7b29218b09 /usr.sbin/sysmerge/sysmerge.8 | |
| parent | remove trailing whitespace; (diff) | |
| download | wireguard-openbsd-84fb2c9e207883e1850c27db00b20f655067582d.tar.xz wireguard-openbsd-84fb2c9e207883e1850c27db00b20f655067582d.zip | |
Teach sysmerge to retrieve {etc,xetc}*.tgz files from FTP/HTTP
paths using ftp(1). Thanks ajacoutot and jmc for suggestions.
ok ajacoutot jmc, no objection deraadt
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 55a8eaf746c..130ebcd476e 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.9 2008/07/04 10:23:56 jmc Exp $ +.\" $OpenBSD: sysmerge.8,v 1.10 2008/07/04 15:03:45 sthen Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -163,12 +163,13 @@ later manual processing. Specify a path to an .Ox top src directory or an etcXX.tgz tarball. +A tarball path specified as an FTP or HTTP URL will be passed +to ${FETCH_CMD}. .It Fl x Ar xetcXX.tgz Specify a path to an xetcXX.tgz tarball. -If this option is specified, it will add -.Xr X 7 -configuration files to the comparison. +A tarball path specified as an FTP or HTTP URL will be passed +to ${FETCH_CMD}. .El .Sh ENVIRONMENT .Bl -tag -width "DESTDIRXXX" @@ -176,6 +177,10 @@ configuration files to the comparison. Directory in which to merge and install files. If unset, this defaults to .Pa / . +.It Ev FETCH_CMD +Command used to fetch remote files. +Defaults to +.Xr ftp 1 . .It Ev TMPDIR Directory in which the work directory is created. If unset, this defaults to |