Page MenuHomeFreeBSD
Files F109625825

D26432.diff
No OneTemporary
Actions

D26432.diff
View Options

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

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 8, 3:52 PM (20 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16528510
Default Alt Text
D26432.diff (2 KB)

Event Timeline