Date: Wed, 10 Aug 2011 20:52:02 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r224765 - head/etc Message-ID: <201108102052.p7AKq2XS060985@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Wed Aug 10 20:52:02 2011 New Revision: 224765 URL: http://svn.freebsd.org/changeset/base/224765 Log: Revert r224760, and enhance the sed patterns from r224659 to comment out the _compat entries in the WITHOUT_NIS case rather then delete them. Approved by: re (kib) Modified: head/etc/Makefile head/etc/nsswitch.conf Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Wed Aug 10 19:40:23 2011 (r224764) +++ head/etc/Makefile Wed Aug 10 20:52:02 2011 (r224765) @@ -256,6 +256,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}/ Modified: head/etc/nsswitch.conf ============================================================================== --- head/etc/nsswitch.conf Wed Aug 10 19:40:23 2011 (r224764) +++ head/etc/nsswitch.conf Wed Aug 10 20:52:02 2011 (r224765) @@ -1,23 +1,15 @@ # +# nsswitch.conf(5) - name service switch configuration file # $FreeBSD$ # -# 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 - +group: compat +group_compat: nis hosts: files dns networks: files +passwd: compat +passwd_compat: nis shells: files +services: compat +services_compat: nis protocols: files rpc: files
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108102052.p7AKq2XS060985>