Fix installkernel requiring users/groups defined in CHECK_UIDS

and CHECK_GIDS to exist since r152680. This is only needed for
installworld. The documented procedure of running mergemaster -p
to check for missing users is only needed for installworld, not
for installkernel. This fixes auditdistd incorrectly being
required for installkernel.

PR:		misc/174405
Approved by:	bapt
This commit is contained in:
Bryan Drewery 2013-04-23 13:07:58 +00:00
parent b268ae6440
commit 61f75c4945

View File

@ -647,7 +647,6 @@ CHECK_GIDS+= smmsp
CHECK_UIDS+= proxy
CHECK_GIDS+= proxy authpf
.endif
installcheck: installcheck_UGID
installcheck_UGID:
.for uid in ${CHECK_UIDS}
@if ! `id -u ${uid} >/dev/null 2>&1`; then \
@ -703,7 +702,7 @@ EXTRA_DISTRIBUTIONS+= lib32
MTREE_MAGIC?= mtree 2.0
distributeworld installworld: installcheck
distributeworld installworld: installcheck installcheck_UGID
mkdir -p ${INSTALLTMP}
progs=$$(for prog in ${ITOOLS}; do \
if progpath=`which $$prog`; then \