lukem
Tue Sep 16 05:31:03 PDT 1997
Update of /cvsroot/src/sbin/mount_null
In directory netbsd1:/var/slash-tmp/cvs-serv14938

Modified Files:
	mount_null.8 mount_null.c 
Log Message:
resolve conflicts from lite-2 merge

lukem
Tue Sep 16 05:31:13 PDT 1997
Update of /cvsroot/src/sbin/mount_nfs
In directory netbsd1:/var/slash-tmp/cvs-serv14993

Modified Files:
	Makefile 
Removed Files:
	getmntopts.c mntopts.h 
Log Message:
back to using mount/getmntopts.c since mount is now post lite-2

lukem
Tue Sep 16 05:32:05 PDT 1997
Update of /cvsroot/src/sbin/mount_procfs
In directory netbsd1:/var/slash-tmp/cvs-serv15123

Modified Files:
	mount_procfs.8 mount_procfs.c 
Log Message:
resolve conflicts from lite-2 merge

lukem
Tue Sep 16 05:32:26 PDT 1997
Update of /cvsroot/src/sbin/mount_portal
In directory netbsd1:/var/slash-tmp/cvs-serv15185

Modified Files:
	activate.c mount_portal.c pt_file.c pt_tcp.c 
Log Message:
resolve conflicts from lite-2 merge

lukem
Tue Sep 16 05:32:34 PDT 1997
Update of /cvsroot/src/sbin/mount_umap
In directory netbsd1:/var/slash-tmp/cvs-serv15245

Modified Files:
	mount_umap.8 mount_umap.c 
Log Message:
resolve conflicts from lite-2 merge

lukem
Tue Sep 16 05:32:55 PDT 1997
Update of /cvsroot/src/sbin/mount_union
In directory netbsd1:/var/slash-tmp/cvs-serv15312

Modified Files:
	Makefile mount_union.8 mount_union.c 
Log Message:
resolve conflicts from lite-2 merge

lukem
Tue Sep 16 05:37:48 PDT 1997
Update of /cvsroot/src/sbin/newfs
In directory netbsd1:/var/slash-tmp/cvs-serv15570

Log Message:
imported from lite-2

Status:

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

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

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


lukem
Tue Sep 16 05:38:50 PDT 1997
Update of /cvsroot/src/sbin/newlfs
In directory netbsd1:/var/slash-tmp/cvs-serv15628

Log Message:
imported from lite-2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/sbin/newlfs/lfs.c
U src/sbin/newlfs/Makefile
U src/sbin/newlfs/misc.c
C src/sbin/newlfs/config.h
C src/sbin/newlfs/extern.h
C src/sbin/newlfs/newfs.c
U src/sbin/newlfs/newlfs.8

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

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


lukem
Tue Sep 16 05:39:13 PDT 1997
Update of /cvsroot/src/sbin/nologin
In directory netbsd1:/var/slash-tmp/cvs-serv15711

Log Message:
imported from lite-2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/sbin/nologin/nologin.sh
U src/sbin/nologin/Makefile
U src/sbin/nologin/nologin.8

No conflicts created by this import