Skip to content

Commit

Permalink
Merge branch 'master' of github.com:qbit/snap
Browse files Browse the repository at this point in the history
  • Loading branch information
qbit committed May 2, 2018
2 parents 682fb35 + 0c72b2a commit 4d24e5b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ file:
**MIRROR string**

> Defaults to \`ftp3.usa.openbsd.org\`.
> Defaults to \`cdn.openbsd.org\`.
# EXAMPLES

Expand All @@ -255,7 +255,7 @@ To upgrade to the latest snapshot:

To upgrade to the latest snapshot using an explicit mirror region:

$ doas snap -M ftp3.usa.openbsd.org
$ doas snap -M cdn.openbsd.org

To upgrade to a snapshot without updating xsets:

Expand All @@ -270,7 +270,7 @@ would look something like this:
INTERACTIVE:true
MERGE:true
AFTER:/etc/after_snap
MIRROR:ftp3.usa.openbsd.org
MIRROR:cdn.openbsd.org
FTP_OPTS:-C -V

## EXAMPLE AFTER SCRIPT
Expand Down
8 changes: 4 additions & 4 deletions snap
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ snap options:
-V <setversion> used to force snap to use <setversion> for sets (example: -V 5.3). Note: this will only append 53 to sets, ie base53.tgz.
-r run sysmerge after extracting {x}sets. (May dump core if the snapshots have introduced ABI changes. Not recommended.)
-x do not extract x11 sets.
-M specify a mirror to use (example: " -M ftp3.usa.openbsd.org")
-M specify a mirror to use (example: " -M cdn.openbsd.org")
-I [full path to SHA256.sig file] verify integrity of snap.
-i interactive with colors.
-n force using bsd.mp as bsd.
Expand All @@ -60,7 +60,7 @@ snap options:
To update to the latest snapshot using an explicit mirror
region:
$ doas snap -M ftp3.usa.openbsd.org
$ doas snap -M cdn.openbsd.org
To update to the snapshot without updating xsets:
Expand All @@ -77,7 +77,7 @@ snap options:
INTERACTIVE:true
DST:/tmp/upgrade
MERGE:true
MIRROR:ftp3.usa.openbsd.org
MIRROR:cdn.openbsd.org
NO_X11:true
EOF
Expand Down Expand Up @@ -320,7 +320,7 @@ WEXIT=$(get_conf_var 'WEXIT' || echo 'false')

MIRROR=$(get_conf_var 'MIRROR' || \
awk -F/ 'match($3, /[a-z]/) {print $3}' /etc/installurl 2> /dev/null || \
echo "ftp3.usa.openbsd.org")
echo "cdn.openbsd.org")

while getopts "b:Bc:dD:ehiIkKm:M:nrRsSuUV:wx" arg; do
case $arg in
Expand Down
6 changes: 3 additions & 3 deletions snap.8
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ Specifies a script to be copied to
The script will then be executed upon successful reboot.
Default is not set.
.It Cm MIRROR string
Defaults to `ftp3.usa.openbsd.org`.
Defaults to `cdn.openbsd.org`.
.El
.Sh EXAMPLES
.Ss EXAMPLE USAGE
Expand All @@ -209,7 +209,7 @@ $ doas snap
.Pp
To upgrade to the latest snapshot using an explicit mirror region:
.Bd -literal -offset indent
$ doas snap -M ftp3.usa.openbsd.org
$ doas snap -M cdn.openbsd.org
.Ed
.Pp
To upgrade to a snapshot without updating xsets:
Expand All @@ -224,7 +224,7 @@ would look something like this:
INTERACTIVE:true
MERGE:true
AFTER:/etc/after_snap
MIRROR:ftp3.usa.openbsd.org
MIRROR:cdn.openbsd.org
FTP_OPTS:-C -V
.Ed
.Ss EXAMPLE AFTER SCRIPT
Expand Down

0 comments on commit 4d24e5b

Please sign in to comment.