Index: freebsd-update.sh =================================================================== RCS file: /home/ncvs/src/usr.sbin/freebsd-update/freebsd-update.sh,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 freebsd-update.sh --- freebsd-update.sh 2 Sep 2006 11:05:24 -0000 1.2.2.1 +++ freebsd-update.sh 28 Sep 2006 08:44:07 -0000 @@ -485,9 +485,14 @@ # to provide an upgrade path for FreeBSD Update 1.x users, since # the kernels provided by FreeBSD Update 1.x are always labelled # as X.Y-SECURITY. - RELNUM=`uname -r | - sed -E 's,-p[0-9]+,,' | - sed -E 's,-SECURITY,-RELEASE,'` + # XXX: FOLLOW_BRANCH + if [ -z ${FOLLOW_BRANCH} ] ; then + RELNUM=`uname -r | + sed -E 's,-p[0-9]+,,' | + sed -E 's,-SECURITY,-RELEASE,'` + else + RELENUM=${FOLLOW_BRANCH} + fi ARCH=`uname -m` FETCHDIR=${RELNUM}/${ARCH}