diff options
| author | dougb <dougb@FreeBSD.org> | 2011-08-06 09:16:53 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2011-08-06 09:16:53 +0000 |
| commit | 9d5fe42c4ea8bf40bcf707a9bbd43f0436f582ff (patch) | |
| tree | 1778c79e6583aed8f24339cb7fce5ba410f8e601 /etc | |
| parent | a2f14c3f0adcc93a23ffa2f6c5000beb40b46e5b (diff) | |
| download | FreeBSD-src-9d5fe42c4ea8bf40bcf707a9bbd43f0436f582ff.zip FreeBSD-src-9d5fe42c4ea8bf40bcf707a9bbd43f0436f582ff.tar.gz | |
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)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/nsswitch.conf | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/etc/Makefile b/etc/Makefile index bfb5282..e7fa2d5 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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}/ diff --git a/etc/nsswitch.conf b/etc/nsswitch.conf index c95b9a4..ab27fb9 100644 --- a/etc/nsswitch.conf +++ b/etc/nsswitch.conf @@ -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 |
