svn commit: r225395 - stable/8/etc

[Ed Schouten]

Author: ed
Date: Mon Sep  5 11:08:33 2011
New Revision: 225395
URL: http://svn.freebsd.org/changeset/base/225395

Log:
  MFC r224659, r224674 and r224765:
  
    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.

Modified:
  stable/8/etc/Makefile
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/8/etc/Makefile
==============================================================================
--- stable/8/etc/Makefile	Mon Sep  5 10:45:29 2011	(r225394)
+++ stable/8/etc/Makefile	Mon Sep  5 11:08:33 2011	(r225395)
@@ -252,6 +252,10 @@ distribution:
 	    ${DESTDIR}/boot/device.hints
 .endif
 .endif
+.if ${MK_NIS} == "no"
+	sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
+		${DESTDIR}/etc/nsswitch.conf
+.endif
 
 distrib-dirs:
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/