d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freebsd-update: Allow upgrade from pre-release builds

Browse Source 
Update r343122 to include -ALPHA, -BETA and -RC releases as
upgrade-able via freebsd-update.

PR:		234771
Submitted by:	Gerald Aryeetey <aryeeteygerald_rogers.com>
Reported by:	delphij, des
Reviewed by:	delphij
MFC with:	r343122
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D18881
This commit is contained in:
Ed Maste 2019-01-21 19:21:11 +00:00
parent 9b6591109e
commit d308a8bf0f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=343271
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -668,17 +668,23 @@ fetchupgrade_check_params () {
FETCHDIR=${RELNUM}/${ARCH}
PATCHDIR=${RELNUM}/${ARCH}/bp
# Disallow upgrade from a version that is not `-RELEASE`
if ! echo "${RELNUM}" | grep -qE -- "-RELEASE$"; then
echo -n "`basename $0`: "
cat <<- EOF
Cannot upgrade from a version that is not a '-RELEASE' using `basename $0`.
Instead, FreeBSD can be directly upgraded by source or upgraded to a
RELEASE/RELENG version prior to running `basename $0`.
EOF
echo "System version: ${RELNUM}"
exit 1
fi
# Disallow upgrade from a version that is not a release
case ${RELNUM} in
*-RELEASE | *-ALPHA* | *-BETA* | *-RC*)
;;
*)
echo -n "`basename $0`: "
cat <<- EOF
Cannot upgrade from a version that is not a release
(including alpha, beta and release candidates)
using `basename $0`. Instead, FreeBSD can be directly
upgraded by source or upgraded to a RELEASE/RELENG version
prior to running `basename $0`.
Currently running: ${RELNUM}
EOF
exit 1
;;
esac
# Figure out what directory contains the running kernel
BOOTFILE=`sysctl -n kern.bootfile`