Page MenuHomeFreeBSD
Files F115845023

D43700.id135061.diff
No OneTemporary
Actions

D43700.id135061.diff
View Options

diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -776,7 +776,7 @@
if ! [ -z "${TARGETRELEASE}" ]; then
echo -n "`basename $0`: "
- echo -n "-r option is meaningless with 'fetch' command. "
+ echo -n "'-r' option is meaningless with 'fetch' command. "
echo "(Did you mean 'upgrade' instead?)"
exit 1
fi
@@ -784,8 +784,8 @@
# Check that we have updates ready to install
if [ -f ${BDHASH}-install/kerneldone -a $FORCEFETCH -eq 0 ]; then
echo "You have a partially completed upgrade pending"
- echo "Run '$0 install' first."
- echo "Run '$0 fetch -F' to proceed anyway."
+ echo "Run '`basename $0`' with 'install' command (and options) first."
+ echo "Run '`basename $0`' with 'fetch' command and ' -F' option (and others) to proceed anyway."
exit 1
fi
}
@@ -798,7 +798,7 @@
NKERNCONF=${KERNCONF}
# We need TARGETRELEASE set
- _TARGETRELEASE_z="Release target must be specified via -r option."
+ _TARGETRELEASE_z="Release target must be specified via '-r' option."
if [ -z "${TARGETRELEASE}" ]; then
echo -n "`basename $0`: "
echo "${_TARGETRELEASE_z}"
@@ -863,7 +863,7 @@
if ! [ -L ${BDHASH}-install ]; then
echo "No updates are available to install."
if [ $ISFETCHED -eq 0 ]; then
- echo "Run '$0 fetch' first."
+ echo "Run '`basename $0`' with 'fetch' command (and options) first."
exit 2
fi
exit 0
@@ -871,7 +871,7 @@
if ! [ -f ${BDHASH}-install/INDEX-OLD ] ||
! [ -f ${BDHASH}-install/INDEX-NEW ]; then
echo "Update manifest is corrupt -- this should never happen."
- echo "Re-run '$0 fetch'."
+ echo "Re-run '`basename $0`' with 'fetch' command (and options)."
exit 1
fi
@@ -973,7 +973,7 @@
_SERVERNAME_z=\
"SERVERNAME must be given via command line or configuration file."
- _KEYPRINT_z="Key must be given via -k option or configuration file."
+ _KEYPRINT_z="Key must be given via '-k' option or configuration file."
_KEYPRINT_bad="Invalid key fingerprint: "
_WORKDIR_bad="Directory does not exist or is not writable: "
@@ -2326,7 +2326,7 @@
WARNING: This system is running a "${KCOMP}" kernel, which is not a
kernel configuration distributed as part of FreeBSD ${RELNUM}.
This kernel will not be updated: you MUST update the kernel manually
-before running "$0 install".
+before running '`basename $0`' with 'install' command (and options).
EOF
fi
@@ -2770,7 +2770,7 @@
# Remind the user that they need to run "freebsd-update install"
# to install the downloaded bits, in case they didn't RTFM.
- echo "To install the downloaded upgrades, run \"$0 install\"."
+ echo "To install the downloaded upgrades, run '`basename $0`' with 'install' command (and options)."
}
# Make sure that all the file hashes mentioned in $@ have corresponding
@@ -2788,7 +2788,7 @@
if ! [ -f files/${HASH}.gz ]; then
echo -n "Update files missing -- "
echo "this should never happen."
- echo "Re-run '$0 fetch'."
+ echo "Re-run '`basename $0`' with 'fetch' command (and options)."
return 1
fi
done < filelist
@@ -3024,7 +3024,8 @@
cat <<-EOF
Kernel updates have been installed. Please reboot and run
-"$0 install" again to finish installing updates.
+'`basename $0`' with 'install' command (and options) again to finish
+installing updates.
EOF
exit 0
fi
@@ -3111,8 +3112,8 @@
Completing this upgrade requires removing old shared object files.
Please rebuild all installed 3rd party software (e.g., programs
-installed from the ports tree) and then run "$0 install"
-again to finish installing updates.
+installed from the ports tree) and then run '`basename $0`' with
+'install' command (and options) again to finish installing updates.
EOF
rm newfiles
exit 0
@@ -3491,7 +3492,7 @@
fi
echo "There are updates available to install."
- echo "Run '$0 install' to proceed."
+ echo "Run '`basename $0`' with 'install' command (and options) to proceed."
}
# Install downloaded updates.

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 30, 11:25 AM (12 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17857087
Default Alt Text
D43700.id135061.diff (4 KB)

Event Timeline