diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-04-23 13:07:58 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-04-23 13:07:58 +0000 |
| commit | 157a058e219597d4031a4e09a2b1ba55834d8207 (patch) | |
| tree | b25cbb80e295b0c36e8f12066863746996fa7a2e /Makefile.inc1 | |
| parent | 06db46a7675748f59411c34aae21b8131e3dd324 (diff) | |
| download | FreeBSD-src-157a058e219597d4031a4e09a2b1ba55834d8207.zip FreeBSD-src-157a058e219597d4031a4e09a2b1ba55834d8207.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 137454c..899119f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 \ |
