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
This commit is contained in:
Warner Losh 2018-08-16 22:13:43 +00:00
parent 88fa3a7649
commit 6ba33ab591
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=337931

View File

@ -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
)