svn commit: r343152 - head/usr.sbin/freebsd-update

Ed Maste emaste at FreeBSD.org
Fri Jan 18 17:41:46 UTC 2019


Author: emaste
Date: Fri Jan 18 17:41:45 2019
New Revision: 343152
URL: https://svnweb.freebsd.org/changeset/base/343152

Log:
  freebsd-update: Use BASEDIR when checking for src component
  
  src could potentially be installed under the based dir
  and not under the root or vice versa.
  
  PR:		224048
  Submitted by:	Gerald Aryeetey <aryeeteygerald_rogers.com>
  Reviewed by:	delphij
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D18849

Modified:
  head/usr.sbin/freebsd-update/freebsd-update.sh

Modified: head/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- head/usr.sbin/freebsd-update/freebsd-update.sh	Fri Jan 18 16:04:36 2019	(r343151)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh	Fri Jan 18 17:41:45 2019	(r343152)
@@ -221,7 +221,7 @@ config_KeepModifiedMetadata () {
 config_Components () {
 	for C in $@; do
 		if [ "$C" = "src" ]; then
-			if [ -e /usr/src/COPYRIGHT ]; then
+			if [ -e "${BASEDIR}/usr/src/COPYRIGHT" ]; then
 				COMPONENTS="${COMPONENTS} ${C}"
 			else
 				echo "src component not installed, skipped"


More information about the svn-src-head mailing list