svn commit: r224659 - head/etc

[Ed Schouten]

Author: ed
Date: Fri Aug  5 17:33:12 2011
New Revision: 224659
URL: http://svn.freebsd.org/changeset/base/224659

Log:
  Remove NIS entries from /etc/nsswitch.conf for WITHOUT_NIS.
  
  We already modify various configuration files in /etc based on build
  configuration. This is not done for nsswitch.conf right now when setting
  WITHOUT_NIS. This breaks various utilities, including crond, that depend
  on working databases.
  
  Approved by:	re (kib)
  MFC after:	1 month

Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Fri Aug  5 17:15:46 2011	(r224658)
+++ head/etc/Makefile	Fri Aug  5 17:33:12 2011	(r224659)
@@ -256,6 +256,10 @@ 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}/