Author: emaste
Date: Tue Mar  5 18:52:13 2019
New Revision: 344811
URL: https://svnweb.freebsd.org/changeset/base/344811

Log:
  MFC r343152: 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
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/12/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/12/usr.sbin/freebsd-update/freebsd-update.sh Tue Mar  5 18:30:43 
2019        (r344810)
+++ stable/12/usr.sbin/freebsd-update/freebsd-update.sh Tue Mar  5 18:52:13 
2019        (r344811)
@@ -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"
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to