From owner-cvs-sbin Tue Mar 11 03:59:44 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA22107 for cvs-sbin-outgoing; Tue, 11 Mar 1997 03:59:44 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id DAA22097; Tue, 11 Mar 1997 03:59:42 -0800 (PST) Date: Tue, 11 Mar 1997 03:59:42 -0800 (PST) From: Peter Wemm Message-Id: <199703111159.DAA22097@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-sbin Subject: cvs commit: src/sbin - Imported sources Sender: owner-cvs-sbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 97/03/11 03:59:42 src/sbin - Imported sources Update of /home/ncvs/src/sbin In directory freefall.freebsd.org:/tmp/cvs-serv21250 Revision/Branch: 1.1.1 Log Message: Import some CSRG 4.4BSD-Lite2 components for sbin onto vendor branch. (note that some of these have already been imported, this is a no-op) Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 U src/sbin/mount/vfslist.c U src/sbin/mount/getmntopts.3 U src/sbin/mount/getmntopts.c U src/sbin/mount/Makefile U src/sbin/mount/mntopts.h U src/sbin/mount/mount.8 U src/sbin/mount/mount.c U src/sbin/mount/mount_ufs.c U src/sbin/mount/pathnames.h U src/sbin/mount_cd9660/Makefile U src/sbin/mount_cd9660/mount_cd9660.8 C src/sbin/mount_cd9660/mount_cd9660.c U src/sbin/mount_fdesc/Makefile U src/sbin/mount_fdesc/mount_fdesc.8 C src/sbin/mount_fdesc/mount_fdesc.c U src/sbin/mount_kernfs/Makefile U src/sbin/mount_kernfs/mount_kernfs.8 C src/sbin/mount_kernfs/mount_kernfs.c C src/sbin/mount_lfs/mount_lfs.c U src/sbin/mount_lfs/Makefile U src/sbin/mount_lfs/mount_lfs.8 U src/sbin/mount_lfs/pathnames.h U src/sbin/mount_nfs/Makefile C src/sbin/mount_nfs/mount_nfs.8 C src/sbin/mount_nfs/mount_nfs.c U src/sbin/mount_null/Makefile C src/sbin/mount_null/mount_null.8 C src/sbin/mount_null/mount_null.c C src/sbin/mount_portal/activate.c U src/sbin/mount_portal/conf.c U src/sbin/mount_portal/Makefile U src/sbin/mount_portal/mount_portal.8 C src/sbin/mount_portal/mount_portal.c U src/sbin/mount_portal/pathnames.h U src/sbin/mount_portal/portal.conf U src/sbin/mount_portal/portald.h U src/sbin/mount_portal/pt_conf.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 U src/sbin/mount_procfs/Makefile C src/sbin/mount_procfs/mount_procfs.8 C src/sbin/mount_procfs/mount_procfs.c U src/sbin/mount_umap/umap_manual 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/sample.group.mapfile U src/sbin/mount_umap/sample.user.mapfile C src/sbin/mount_union/Makefile C src/sbin/mount_union/mount_union.8 C src/sbin/mount_union/mount_union.c C src/sbin/mountd/exports.5 U src/sbin/mountd/Makefile C src/sbin/mountd/mountd.8 C src/sbin/mountd/mountd.c U src/sbin/mountd/netgroup.5 U src/sbin/mountd/pathnames.h U src/sbin/nfsd/Makefile C src/sbin/nfsd/nfsd.8 C src/sbin/nfsd/nfsd.c U src/sbin/nfsiod/Makefile U src/sbin/nfsiod/nfsiod.8 C src/sbin/nfsiod/nfsiod.c U src/sbin/quotacheck/Makefile U src/sbin/quotacheck/quotacheck.8 C src/sbin/quotacheck/quotacheck.c C src/sbin/restore/utilities.c C src/sbin/restore/dirs.c U src/sbin/restore/extern.h C src/sbin/restore/interactive.c C src/sbin/restore/main.c U src/sbin/restore/Makefile U src/sbin/restore/pathnames.h C src/sbin/restore/restore.8 C src/sbin/restore/restore.c U src/sbin/restore/restore.h C src/sbin/restore/symtab.c C src/sbin/restore/tape.c U src/sbin/dump/unctime.c C src/sbin/dump/dump.8 C src/sbin/dump/dump.h C src/sbin/dump/dumprmt.c U src/sbin/dump/itime.c C src/sbin/dump/main.c U src/sbin/dump/Makefile U src/sbin/dump/optr.c U src/sbin/dump/pathnames.h C src/sbin/dump/tape.c C src/sbin/dump/traverse.c U src/sbin/dumpfs/dumpfs.8 C src/sbin/dumpfs/dumpfs.c U src/sbin/dumpfs/Makefile U src/sbin/dumplfs/dumplfs.8 U src/sbin/dumplfs/dumplfs.c U src/sbin/dumplfs/extern.h U src/sbin/dumplfs/Makefile U src/sbin/dumplfs/misc.c U src/sbin/newfs/newfs.8 U src/sbin/newfs/Makefile U src/sbin/newfs/mkfs.c U src/sbin/newfs/newfs.c C src/sbin/newlfs/config.h U src/sbin/newlfs/extern.h C src/sbin/newlfs/lfs.c U src/sbin/newlfs/Makefile U src/sbin/newlfs/misc.c C src/sbin/newlfs/newfs.c U src/sbin/newlfs/newlfs.8 C src/sbin/umount/Makefile C src/sbin/umount/umount.8 C src/sbin/umount/umount.c C src/sbin/fsck/dir.c C src/sbin/fsck/fsck.8 C src/sbin/fsck/fsck.h C src/sbin/fsck/inode.c C src/sbin/fsck/main.c C src/sbin/fsck/Makefile C src/sbin/fsck/pass1.c C src/sbin/fsck/pass1b.c C src/sbin/fsck/pass2.c C src/sbin/fsck/pass3.c C src/sbin/fsck/pass4.c C src/sbin/fsck/pass5.c C src/sbin/fsck/preen.c C src/sbin/fsck/setup.c C src/sbin/fsck/utilities.c U src/sbin/fsck/SMM.doc/2.t U src/sbin/fsck/SMM.doc/1.t U src/sbin/fsck/SMM.doc/0.t U src/sbin/fsck/SMM.doc/3.t U src/sbin/fsck/SMM.doc/4.t U src/sbin/fsck/SMM.doc/Makefile 62 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/sbin