mikel
Mon Feb 24 23:12:45 PST 1997
Update of /cvsroot/src/etc
In directory netbsd1:/home/mikel/etc

Log Message:
import 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/etc/services
U src/etc/rc
U src/etc/hosts
U src/etc/daily
U src/etc/netstart
C src/etc/Makefile
U src/etc/monthly
U src/etc/gettytab
U src/etc/hosts.equiv
C src/etc/rc.local
U src/etc/ttys
U src/etc/weekly
C src/etc/master.passwd
U src/etc/hosts.lpd
U src/etc/crontab
U src/etc/csh.cshrc
U src/etc/aliases
U src/etc/group
U src/etc/inetd.conf
U src/etc/protocols
U src/etc/motd
U src/etc/printcap
U src/etc/syslog.conf
U src/etc/security
U src/etc/man.conf
U src/etc/csh.login
U src/etc/csh.logout
U src/etc/dm.conf
U src/etc/phones
U src/etc/networks
U src/etc/remote
U src/etc/shells
U src/etc/ftpusers
U src/etc/exports
U src/etc/MAKEDEV.local
U src/etc/changelist
U src/etc/COPYRIGHT
U src/etc/crontab.local
U src/etc/ftpwelcome
U src/etc/netgroup
U src/etc/amd-n
U src/etc/amd-home
U src/etc/FILESTOCOPY
U src/etc/root/dot.cshrc
U src/etc/root/dot.login
U src/etc/root/dot.profile
U src/etc/root/dot.klogin
U src/etc/root/dot.rhosts
U src/etc/mtree/4.4BSD.dist
U src/etc/mtree/special
U src/etc/mtree/4.4BSD.var
U src/etc/mtree/4.4BSD.root
U src/etc/mtree/4.4BSD.usr
N src/etc/kerberosIV/krb.conf
N src/etc/kerberosIV/README
N src/etc/kerberosIV/krb.realms
U src/etc/namedb/localhost.rev
U src/etc/namedb/named.boot

4 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/etc