Use find(1) instead of ``pw groupshow'' to detect missing groups.

Restore checks for recently added PF groups.

Reviewed by:	mlaier
This commit is contained in:
ru 2004-03-12 13:20:24 +00:00
parent 37f2e4ca22
commit 893c24a298

View File

@ -407,23 +407,29 @@ sparc64_installcheck:
#
# Checks to be sure system is ready for installworld
#
installcheck: ${SPECIAL_INSTALLCHECKS}
CHECK_UIDS=
CHECK_GIDS=
.if !defined(NO_SENDMAIL)
@if ! `id -u smmsp > /dev/null`; then \
echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \
false; \
fi
@if ! `pw groupshow smmsp > /dev/null`; then \
echo "ERROR: Required smmsp group is missing, see /usr/src/UPDATING."; \
false; \
fi
CHECK_UIDS+= smmsp
CHECK_GIDS+= smmsp
.endif
.if !defined(NO_PF)
@if ! `id -u proxy > /dev/null`; then \
echo "ERROR: Required proxy user is missing, see /usr/src/UPDATING."; \
CHECK_UIDS+= proxy
CHECK_GIDS+= proxy authpf
.endif
installcheck: ${SPECIAL_INSTALLCHECKS}
.for uid in ${CHECK_UIDS}
@if ! `id -u ${uid} > /dev/null`; then \
echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
false; \
fi
.endif
.endfor
.for gid in ${CHECK_GIDS}
@if ! `find / -prune -group ${gid} > /dev/null`; then \
echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \
false; \
fi
.endfor
#
# distributeworld