Rather than edit the nsswitch.conf file based on ${MK_NIS} == "no"

comment out the NIS _compat options by default, but leave them in
the file for the convenience of users who want to enable it.

Update the comment in the file accordingly.

Reviewed by:	ed
Approved by:	re (hrs)
This commit is contained in:
Doug Barton 2011-08-06 09:16:53 +00:00
parent 7fab6043a0
commit c2aedca43b
2 changed files with 15 additions and 11 deletions

View File

@ -256,10 +256,6 @@ distribution:
${DESTDIR}/boot/device.hints
.endif
.endif
.if ${MK_NIS} == "no"
sed -i "" -e '/_compat:/d' -e 's/compat/files/' \
${DESTDIR}/etc/nsswitch.conf
.endif
distrib-dirs:
mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/

View File

@ -1,15 +1,23 @@
#
# nsswitch.conf(5) - name service switch configuration file
# $FreeBSD$
#
group: compat
group_compat: nis
# To enable NIS the commented entries should replace their uncommented
# equivalents. See nsswitch.conf(5) for more information.
#
group: files
#group_compat: nis
#group: compat
passwd: files
#passwd_compat: nis
#passwd: compat
services: files
#services_compat: nis
#services: compat
hosts: files dns
networks: files
passwd: compat
passwd_compat: nis
shells: files
services: compat
services_compat: nis
protocols: files
rpc: files