View | Details | Raw Unified | Return to bug 184282
Collapse All | Expand All

(-)etc/freebsd-update.conf (+4 lines)
Lines 74-76 MergeChanges /etc/ /boot/device.hints Link Here
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
# If the new release is the specified value, don't emit an email announcing
79
# it.  (Default: unspecified)
80
# IgnoreReleases 9.1-RELEASE-p8
(-)share/man/man5/freebsd-update.conf.5 (+7 lines)
Lines 218-223 backup kernel, the Link Here
218
.Cm freebsd-update
218
.Cm freebsd-update
219
rollback command will recreate the symbol files along with the old
219
rollback command will recreate the symbol files along with the old
220
kernel.
220
kernel.
221
.It Cm IgnoreReleases
222
The parameters following this keyword are regular expressions;
223
if the new release matches one of them, it will be ignored by
224
.Cm cron .
225
.Pp
226
This option can be specified multiple times, and the parameters
227
accumulate.
221
.El
228
.El
222
.Sh FILES
229
.Sh FILES
223
.Bl -tag -width "/etc/freebsd-update.conf"
230
.Bl -tag -width "/etc/freebsd-update.conf"
(-)usr.sbin/freebsd-update/freebsd-update.sh (-1 / +24 lines)
Lines 88-93 EOF Link Here
88
CONFIGOPTIONS="KEYPRINT WORKDIR SERVERNAME MAILTO ALLOWADD ALLOWDELETE
88
CONFIGOPTIONS="KEYPRINT WORKDIR SERVERNAME MAILTO ALLOWADD ALLOWDELETE
89
    KEEPMODIFIEDMETADATA COMPONENTS IGNOREPATHS UPDATEIFUNMODIFIED
89
    KEEPMODIFIEDMETADATA COMPONENTS IGNOREPATHS UPDATEIFUNMODIFIED
90
    BASEDIR VERBOSELEVEL TARGETRELEASE STRICTCOMPONENTS MERGECHANGES
90
    BASEDIR VERBOSELEVEL TARGETRELEASE STRICTCOMPONENTS MERGECHANGES
91
    IGNORERELEASE
91
    IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES"
92
    IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES"
92
93
93
# Set all the configuration options to "".
94
# Set all the configuration options to "".
Lines 217-222 config_Components () { Link Here
217
	done
218
	done
218
}
219
}
219
220
221
# Add to the list of releases updates to will be ignored.
222
config_IgnoreReleases () {
223
	for C in $@; do
224
		IGNORERELEASE="${IGNORERELEASE} ${C}"
225
	done
226
}
227
220
# Add to the list of paths under which updates will be ignored.
228
# Add to the list of paths under which updates will be ignored.
221
config_IgnorePaths () {
229
config_IgnorePaths () {
222
	for C in $@; do
230
	for C in $@; do
Lines 2086-2091 fetch_run () { Link Here
2086
	fetch_warn_eol || return 1
2094
	fetch_warn_eol || return 1
2087
}
2095
}
2088
2096
2097
# If the available release is in IgnoreReleases, return true.
2098
# Else, return false.
2099
cron_suppress_mail() {
2100
	TMPFILE=$1
2101
	if grep -q "No updates needed" ${TMPFILE}; then
2102
		return 0
2103
	fi
2104
	for X in ${IGNORERELEASE}; do
2105
		if echo "${RELNUM}-p${RELPATCHNUM}" | grep -q "${X}"; then
2106
			return 0
2107
		fi
2108
	done
2109
	return 1
2110
}
2111
2089
# If StrictComponents is not "yes", generate a new components list
2112
# If StrictComponents is not "yes", generate a new components list
2090
# with only the components which appear to be installed.
2113
# with only the components which appear to be installed.
2091
upgrade_guess_components () {
2114
upgrade_guess_components () {
Lines 3199-3205 cmd_cron () { Link Here
3199
3222
3200
	TMPFILE=`mktemp /tmp/freebsd-update.XXXXXX` || exit 1
3223
	TMPFILE=`mktemp /tmp/freebsd-update.XXXXXX` || exit 1
3201
	if ! fetch_run >> ${TMPFILE} ||
3224
	if ! fetch_run >> ${TMPFILE} ||
3202
	    ! grep -q "No updates needed" ${TMPFILE} ||
3225
	    ! cron_suppress_mail ${TMPFILE} ||
3203
	    [ ${VERBOSELEVEL} = "debug" ]; then
3226
	    [ ${VERBOSELEVEL} = "debug" ]; then
3204
		mail -s "`hostname` security updates" ${MAILTO} < ${TMPFILE}
3227
		mail -s "`hostname` security updates" ${MAILTO} < ${TMPFILE}
3205
	fi
3228
	fi

Return to bug 184282