NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

lukem
Tue Sep 16 04:21:47 PDT 1997
Update of /cvsroot/src/sbin/mount_portal
In directory netbsd1:/var/slash-tmp/cvs-serv7794

Log Message:
imported from lite-2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
U src/sbin/mount_portal/Makefile
U src/sbin/mount_portal/conf.c
C src/sbin/mount_portal/activate.c
U src/sbin/mount_portal/pathnames.h
U src/sbin/mount_portal/mount_portal.8
U src/sbin/mount_portal/portal.conf
U src/sbin/mount_portal/portald.h
U src/sbin/mount_portal/pt_conf.c
C src/sbin/mount_portal/mount_portal.c
U src/sbin/mount_portal/pt_exec.c
C src/sbin/mount_portal/pt_file.c
C src/sbin/mount_portal/pt_tcp.c

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

        cvs checkout -jCSRG:yesterday -jCSRG src/sbin/mount_portal


lukem
Tue Sep 16 04:22:34 PDT 1997
Update of /cvsroot/src/sbin/mount_procfs
In directory netbsd1:/var/slash-tmp/cvs-serv7989

Log Message:
imported from lite-2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
U src/sbin/mount_procfs/Makefile
C src/sbin/mount_procfs/mount_procfs.8
C src/sbin/mount_procfs/mount_procfs.c

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

        cvs checkout -jCSRG:yesterday -jCSRG src/sbin/mount_procfs


lukem
Tue Sep 16 04:23:00 PDT 1997
Update of /cvsroot/src/sbin/mount_umap
In directory netbsd1:/var/slash-tmp/cvs-serv8065

Log Message:
imported from lite-2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
U src/sbin/mount_umap/Makefile
C src/sbin/mount_umap/mount_umap.8
C src/sbin/mount_umap/mount_umap.c
U src/sbin/mount_umap/umap_manual
U src/sbin/mount_umap/sample.user.mapfile
U src/sbin/mount_umap/sample.group.mapfile

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

        cvs checkout -jCSRG:yesterday -jCSRG src/sbin/mount_umap


lukem
Tue Sep 16 04:23:23 PDT 1997
Update of /cvsroot/src/sbin/mount_union
In directory netbsd1:/var/slash-tmp/cvs-serv8124

Log Message:
imported from lite-2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
C src/sbin/mount_union/Makefile
C src/sbin/mount_union/mount_union.8
C src/sbin/mount_union/mount_union.c

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

        cvs checkout -jCSRG:yesterday -jCSRG src/sbin/mount_union