hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-15 14:56:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move finalize_components_config from get_params to cmd_*.

Browse Source 
This allows us to redirect its output in cmd_cron, so that the
"src component not installed, skipped" message will be treated
the same way as other output from freebsd-update cron: Sent
in an email to root (or other address specified) if there are
updates to install, and silenced otherwise.

PR:		202492
MFC After:	1 week
Differential Revision:	https://reviews.freebsd.org/D26432
This commit is contained in:
Colin Percival 2020-09-19 02:15:56 +00:00
parent eef96401a9
commit 9a63bbc93e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=365898
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/freebsd-update/freebsd-update.sh
View File

@ -3300,12 +3300,12 @@ get_params () {
parse_cmdline $@ parse_cmdline $@
parse_conffile parse_conffile
default_params default_params
finalize_components_config ${COMPONENTS}
} }
# Fetch command. Make sure that we're being called # Fetch command. Make sure that we're being called
# interactively, then run fetch_check_params and fetch_run # interactively, then run fetch_check_params and fetch_run
cmd_fetch () { cmd_fetch () {
finalize_components_config ${COMPONENTS}
if [ ! -t 0 -a $NOTTYOK -eq 0 ]; then if [ ! -t 0 -a $NOTTYOK -eq 0 ]; then
echo -n "`basename $0` fetch should not " echo -n "`basename $0` fetch should not "
echo "be run non-interactively." echo "be run non-interactively."
@ -3326,6 +3326,7 @@ cmd_cron () {
sleep `jot -r 1 0 3600` sleep `jot -r 1 0 3600`
TMPFILE=`mktemp /tmp/freebsd-update.XXXXXX` || exit 1 TMPFILE=`mktemp /tmp/freebsd-update.XXXXXX` || exit 1
finalize_components_config ${COMPONENTS} >> ${TMPFILE}
if ! fetch_run >> ${TMPFILE} || if ! fetch_run >> ${TMPFILE} ||
! grep -q "No updates needed" ${TMPFILE} || ! grep -q "No updates needed" ${TMPFILE} ||
[ ${VERBOSELEVEL} = "debug" ]; then [ ${VERBOSELEVEL} = "debug" ]; then
@ -3337,6 +3338,7 @@ cmd_cron () {
# Fetch files for upgrading to a new release. # Fetch files for upgrading to a new release.
cmd_upgrade () { cmd_upgrade () {
finalize_components_config ${COMPONENTS}
upgrade_check_params upgrade_check_params
upgrade_run || exit 1 upgrade_run || exit 1
} }
@ -3344,6 +3346,7 @@ cmd_upgrade () {
# Check if there are fetched updates ready to install. # Check if there are fetched updates ready to install.
# Chdir into the working directory. # Chdir into the working directory.
cmd_updatesready () { cmd_updatesready () {
finalize_components_config ${COMPONENTS}
# Check if working directory exists (if not, no updates pending) # Check if working directory exists (if not, no updates pending)
if ! [ -e "${WORKDIR}" ]; then if ! [ -e "${WORKDIR}" ]; then
echo "No updates are available to install." echo "No updates are available to install."
@ -3368,24 +3371,28 @@ cmd_updatesready () {
# Install downloaded updates. # Install downloaded updates.
cmd_install () { cmd_install () {
finalize_components_config ${COMPONENTS}
install_check_params install_check_params
install_run || exit 1 install_run || exit 1
} }
# Rollback most recently installed updates. # Rollback most recently installed updates.
cmd_rollback () { cmd_rollback () {
finalize_components_config ${COMPONENTS}
rollback_check_params rollback_check_params
rollback_run || exit 1 rollback_run || exit 1
} }
# Compare system against a "known good" index. # Compare system against a "known good" index.
cmd_IDS () { cmd_IDS () {
finalize_components_config ${COMPONENTS}
IDS_check_params IDS_check_params
IDS_run || exit 1 IDS_run || exit 1
} }
# Output configuration. # Output configuration.
cmd_showconfig () { cmd_showconfig () {
finalize_components_config ${COMPONENTS}
for X in ${CONFIGOPTIONS}; do for X in ${CONFIGOPTIONS}; do
echo $X=$(eval echo \$${X}) echo $X=$(eval echo \$${X})
done done