Attachment #201246 for bug #185389

Lines 25-33 Link Here

(-)b/usr.sbin/freebsd-update/freebsd-update.8 (-4 / +31 lines)
25	.\"	25	.\"
26	.\" $FreeBSD$	26	.\" $FreeBSD$
27	.\"	27	.\"
28	.Dd June 14, 2017	28	.Dd January 18, 2019
29	.Dt FREEBSD-UPDATE 8	29	.Dt FREEBSD-UPDATE 8
30	.Os FreeBSD	30	.Os
31	.Sh NAME	31	.Sh NAME
32	.Nm freebsd-update	32	.Nm freebsd-update
33	.Nd fetch and install binary updates to FreeBSD	33	.Nd fetch and install binary updates to FreeBSD
Lines 41-55 Link Here
41	.Op Fl r Ar newrelease	41	.Op Fl r Ar newrelease
42	.Op Fl s Ar server	42	.Op Fl s Ar server
43	.Op Fl t Ar address	43	.Op Fl t Ar address
		44	.Op Fl v Ar verbosity
		45	.Op Fl -debug
		46	.Op Fl -no-stats
44	.Op Fl -not-running-from-cron	47	.Op Fl -not-running-from-cron
		48	.Op Fl -currently-running Ar release
45	.Cm command ...	49	.Cm command ...
46	.Sh DESCRIPTION	50	.Sh DESCRIPTION
47	The	51	The
48	.Nm	52	.Nm
49	tool is used to fetch, install, and rollback binary	53	tool is used to fetch, install, and rollback binary
50	updates to the FreeBSD base system.	54	updates to the
		55	.Fx
		56	base system.
51	Note that updates are only available if they are being built for the	57	Note that updates are only available if they are being built for the
52	FreeBSD release and architecture being used; in particular, the	58	.Fx
		59	release and architecture being used; in particular, the
53	.Fx	60	.Fx
54	Security Team only builds updates for releases shipped in binary form	61	Security Team only builds updates for releases shipped in binary form
55	by the	62	by the
Lines 104-109 Mail output of Link Here
104	command, if any, to	111	command, if any, to
105	.Ar address .	112	.Ar address .
106	(default: root, or as given in the configuration file.)	113	(default: root, or as given in the configuration file.)
		114	.It Fl v Ar verbosity
		115	Change the amount of output when performing a
		116	.Nm Cm fetch
		117	or a
		118	.Nm Cm upgrade .
		119	Supported levels include: debug, nostats, stats.
		120	See
		121	.Fl -debug ,
		122	and
		123	.Fl -no-stats
		124	for more information. (default: stats)
		125	.It Fl -debug
		126	Alias for
		127	.Fl v Ar debug .
		128	Shows informational and warning messages from used utilities
		129	that are normally hidden.
		130	.It Fl -no-stats
		131	Alias for
		132	.Fl v Ar nostats .
		133	Hides progress when fetching files.
107	.It Fl -not-running-from-cron	134	.It Fl -not-running-from-cron
108	Force	135	Force
109	.Nm Cm fetch	136	.Nm Cm fetch

Lines 74-76 MergeChanges /etc/ /boot/device.hints Link Here

(-)b/usr.sbin/freebsd-update/freebsd-update.conf (+6 lines)
74		74
75	# When backing up a kernel also back up debug symbol files?	75	# When backing up a kernel also back up debug symbol files?
76	# BackupKernelSymbolFiles no	76	# BackupKernelSymbolFiles no
		77
		78	# How much information to output during "freebsd-update fetch"
		79	# or "freebsd-update upgrade". Can be either stats, debug or nostats.
		80	# "nostats" hides progress information that is normally shown by "stats"
		81	# "debug" shows informational messages and warnings that are normally hidden.
		82	# VerbosityLevel stat

Lines 30-39 Link Here

(-)b/usr.sbin/freebsd-update/freebsd-update.sh (-9 / +13 lines)
30	# $FreeBSD$	30	# $FreeBSD$
31		31
32	#### Usage function -- called from command-line handling code.	32	#### Usage function -- called from command-line handling code.
33
34	# Usage instructions. Options not listed:
35	# --debug -- don't filter output from utilities
36	# --no-stats -- don't show progress statistics while fetching files
37	usage () {	33	usage () {
38	cat <<EOF	34	cat <<EOF
39	usage: `basename $0` [options] command ... [path]	35	usage: `basename $0` [options] command ... [path]
Lines 52-57 Options: Link Here
52	(default: update.FreeBSD.org)	48	(default: update.FreeBSD.org)
53	-t address -- Mail output of cron command, if any, to address	49	-t address -- Mail output of cron command, if any, to address
54	(default: root)	50	(default: root)
		51	-v verbosity -- Change the amout of information output during
		52	fetch or upgrade commands. Can be set to either
		53	debug, nostats, or stats
		54	(default: stat)
		55	--debug -- Don't filter output from utilities
		56	--no-stats -- Don't show progress statistics while fetching files
55	--not-running-from-cron	57	--not-running-from-cron
56	-- Run without a tty, for use by automated tools	58	-- Run without a tty, for use by automated tools
57	--currently-running release	59	--currently-running release
Lines 668-683 fetchupgrade_check_params () { Link Here
668	PATCHDIR=${RELNUM}/${ARCH}/bp	670	PATCHDIR=${RELNUM}/${ARCH}/bp
669		671
670	# Disallow upgrade from a version that is not `-RELEASE`	672	# Disallow upgrade from a version that is not `-RELEASE`
671	if ! echo "${RELNUM}" \| grep -qE -- "-RELEASE$"; then	673	case ${RELNUM} in -RELEASE \| -BETA* \| -RC )
672	echo -n "`basename $0`: "	674	echo -n "`basename $0`: "
673	cat <<- EOF	675	cat <<- EOF
674	Cannot upgrade from a version that is not a '-RELEASE' using `basename $0`.	676	Cannot upgrade from a version that is none of '-RELEASE', '-BETA'
675	Instead, FreeBSD can be directly upgraded by source or upgraded to a	677	or '-RC' using `basename $0`. Instead, FreeBSD can be directly
676	RELEASE/RELENG version prior to running `basename $0`.	678	upgraded by source or upgraded to a RELEASE/RELENG version
		679	prior to running `basename $0`.
677	EOF	680	EOF
678	echo "System version: ${RELNUM}"	681	echo "System version: ${RELNUM}"
679	exit 1	682	exit 1
680	fi	683	;;
		684	esac
681		685
682	# Figure out what directory contains the running kernel	686	# Figure out what directory contains the running kernel
683	BOOTFILE=`sysctl -n kern.bootfile`	687	BOOTFILE=`sysctl -n kern.bootfile`

Return to bug 185389