Author: imp
Date: Thu Aug 16 22:13:43 2018
New Revision: 337931
URL: https://svnweb.freebsd.org/changeset/base/337931

Log:
  Specify DB_FROM_SRC=yes when doing any installation target.
  
  We want to use the UIDs from the installed system, not the host
  system, when installing things.
  
  Sponsored by: Netflix

Modified:
  head/tools/tools/nanobsd/defaults.sh

Modified: head/tools/tools/nanobsd/defaults.sh
==============================================================================
--- head/tools/tools/nanobsd/defaults.sh        Thu Aug 16 22:04:00 2018        
(r337930)
+++ head/tools/tools/nanobsd/defaults.sh        Thu Aug 16 22:13:43 2018        
(r337931)
@@ -388,7 +388,7 @@ install_world ( ) (
        nano_make_install_env
        set -o xtrace
        cd "${NANO_SRC}"
-       ${NANO_MAKE} installworld DESTDIR="${NANO_WORLDDIR}"
+       ${NANO_MAKE} installworld DESTDIR="${NANO_WORLDDIR}" DB_FROM_SRC=yes
        chflags -R noschg "${NANO_WORLDDIR}"
        ) > ${NANO_LOG}/_.iw 2>&1
 )
@@ -401,7 +401,7 @@ install_etc ( ) (
        nano_make_install_env
        set -o xtrace
        cd "${NANO_SRC}"
-       ${NANO_MAKE} distribution DESTDIR="${NANO_WORLDDIR}"
+       ${NANO_MAKE} distribution DESTDIR="${NANO_WORLDDIR}" DB_FROM_SRC=yes
        # make.conf doesn't get created by default, but some ports need it
        # so they can spam it.
        cp /dev/null "${NANO_WORLDDIR}"/etc/make.conf
@@ -424,7 +424,7 @@ install_kernel ( ) (
 
        set -o xtrace
        cd "${NANO_SRC}"
-       ${NANO_MAKE} installkernel DESTDIR="${NANO_WORLDDIR}"
+       ${NANO_MAKE} installkernel DESTDIR="${NANO_WORLDDIR}" DB_FROM_SRC=yes
 
        ) > ${NANO_LOG}/_.ik 2>&1
 )
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to