sync to netbsd

11 files changed, 19 insertions, 21 deletions

diff --git a/distrib/vax/Makefile.inc b/distrib/vax/Makefile.inc
index 002fe3895cb..132af8f14f9 100644
--- a/distrib/vax/Makefile.inc
+++ b/distrib/vax/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.1 1995/10/18 08:37:54 deraadt Exp $
+#	$Id: Makefile.inc,v 1.2 1996/09/05 21:27:33 deraadt Exp $
 
 # Revision is 1.0
 REV=	10A
diff --git a/distrib/vax/inst-common/Makefile.inc b/distrib/vax/inst-common/Makefile.inc
index e7dbaa55dde..f78e43cf6ec 100644
--- a/distrib/vax/inst-common/Makefile.inc
+++ b/distrib/vax/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.1 1995/10/18 08:37:54 deraadt Exp $
+#	$Id: Makefile.inc,v 1.2 1996/09/05 21:27:36 deraadt Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
diff --git a/distrib/vax/inst-common/dot.commonutils b/distrib/vax/inst-common/dot.commonutils
index 8cb5351cdbe..0c313e040e6 100644
--- a/distrib/vax/inst-common/dot.commonutils
+++ b/distrib/vax/inst-common/dot.commonutils
@@ -1,4 +1,3 @@
-#	$OpenBSD: dot.commonutils,v 1.2 1996/04/25 21:32:12 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -27,10 +26,12 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+$
+$	$Id: dot.commonutils,v 1.3 1996/09/05 21:27:37 deraadt Exp $
 
-# Installation utilites (functions), to get OpenBSD installed on
+# Installation utilites (functions), to get NetBSD installed on
 # the hard disk.  These are meant to be invoked from the shell prompt,
-# by people installing OpenBSD.
+# by people installing NetBSD.
 
 Set_tmp_dir()
 {
diff --git a/distrib/vax/inst-common/instbin.conf b/distrib/vax/inst-common/instbin.conf
index 265f54b980c..6361d535e2f 100644
--- a/distrib/vax/inst-common/instbin.conf
+++ b/distrib/vax/inst-common/instbin.conf
@@ -1,6 +1,6 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.2 1996/06/29 05:54:27 tholo Exp $	
+# $Id: instbin.conf,v 1.3 1996/09/05 21:27:37 deraadt Exp $	
 #
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
@@ -8,8 +8,8 @@ srcdirs /usr/src/gnu/usr.bin
 
 progs gawk cat chmod chown chroot cp df disklabel ed expr fsck ftp 
 progs gzip ifconfig init ln ls mkdir mknod more mount mt dd
-progs mount_ffs mount_nfs mv newfs pax reboot rm route sed sh shutdown
-progs slattach strings stty sync test umount update
+progs mount_ffs mount_nfs mv newfs reboot rm route sed sh shutdown
+progs slattach strings stty sync tar test umount update
 
 ln chown chgrp
 ln gzip gzcat gunzip
@@ -17,7 +17,6 @@ ln mount_ffs ffs
 ln mount_nfs nfs
 ln gawk awk
 ln sh -sh		# init invokes the shell this way
-ln pax tar
 ln test [
 ln reboot halt
 
diff --git a/distrib/vax/inst-common/list b/distrib/vax/inst-common/list
index b743b57aa1a..6a701bfbcd0 100644
--- a/distrib/vax/inst-common/list
+++ b/distrib/vax/inst-common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.3 1996/06/29 05:54:28 tholo Exp $
+#	$Id: list,v 1.4 1996/09/05 21:27:38 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -19,7 +19,6 @@ LINK	instbin			bin/sh
 LINK	instbin			bin/-sh
 LINK	instbin			bin/stty
 LINK	instbin			bin/sync
-LINK	instbin			bin/tar
 LINK	instbin			bin/test
 LINK	instbin			bin/[
 LINK	instbin			sbin/disklabel
@@ -46,6 +45,7 @@ LINK	instbin			usr/bin/gzip
 LINK	instbin			usr/bin/more
 LINK	instbin			usr/bin/sed
 LINK	instbin			usr/bin/strings
+LINK	instbin			usr/bin/tar
 # LINK	instbin			usr/sbin/bad144
 LINK	instbin			usr/sbin/chown
 LINK	instbin			usr/sbin/chroot
@@ -71,5 +71,5 @@ COPY	${DESTDIR}/etc/spwd.db		etc
 # and the common installation tools
 COPY	${TOPDIR}/inst-common/termcap.vt	usr/share/misc/termcap
 
-COPY	/genbsd			.
+COPY	/gennetbsd			.
 COPY	/boot				.
diff --git a/distrib/vax/inst-common/mtree.conf b/distrib/vax/inst-common/mtree.conf
index f9283142efe..cf66a793c6b 100644
--- a/distrib/vax/inst-common/mtree.conf
+++ b/distrib/vax/inst-common/mtree.conf
@@ -1,4 +1,4 @@
-#	$Id: mtree.conf,v 1.1 1995/10/18 08:37:54 deraadt Exp $
+#	$Id: mtree.conf,v 1.2 1996/09/05 21:27:38 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
diff --git a/distrib/vax/inst/Makefile b/distrib/vax/inst/Makefile
index fdf54525970..16e8651c664 100644
--- a/distrib/vax/inst/Makefile
+++ b/distrib/vax/inst/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1995/10/18 08:37:54 deraadt Exp $
+#	$Id: Makefile,v 1.2 1996/09/05 21:27:35 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
diff --git a/distrib/vax/inst/dot.profile b/distrib/vax/inst/dot.profile
index dad9cb83389..a4bd1fdfa81 100644
--- a/distrib/vax/inst/dot.profile
+++ b/distrib/vax/inst/dot.profile
@@ -1,5 +1,3 @@
-#	$OpenBSD: dot.profile,v 1.2 1996/04/25 21:32:06 niklas Exp $
-
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH
 TERM=vt100 export TERM
 
@@ -7,10 +5,10 @@ TERM=vt100 export TERM
 echo 'erase ^?, werase ^H, kill ^U, intr ^C'
 stty newcrt werase ^H intr ^C kill ^U erase ^?
 echo
-echo "Now when OpenBSD is booted you're on your own."
+echo "Now when NetBSD is booted you're on your own."
 echo "Remember to write bootblocks and to make devices"
 echo "in dev in your new root filesystem before booting."
-echo "Also remember to copy /genbsd and /boot to the"
+echo "Also remember to copy /gennetbsd and /boot to the"
 echo "new root; it's not there by default."
 echo
 echo "Good luck!"
diff --git a/distrib/vax/inst/list b/distrib/vax/inst/list
index a36d92e3a00..43503da0522 100644
--- a/distrib/vax/inst/list
+++ b/distrib/vax/inst/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.1 1995/10/18 08:37:55 deraadt Exp $
+#	$Id: list,v 1.2 1996/09/05 21:27:36 deraadt Exp $
 
 # the disktab explanation file
 COPY	disktab.preinstall		etc
diff --git a/distrib/vax/list2sh.awk b/distrib/vax/list2sh.awk
index 239c42f5133..40ce721a403 100644
--- a/distrib/vax/list2sh.awk
+++ b/distrib/vax/list2sh.awk
@@ -1,4 +1,4 @@
-#	$Id: list2sh.awk,v 1.1 1995/10/18 08:37:54 deraadt Exp $
+#	$Id: list2sh.awk,v 1.2 1996/09/05 21:27:33 deraadt Exp $
 
 BEGIN {
 	printf("cd ${CURDIR}\n");
diff --git a/distrib/vax/runlist.sh b/distrib/vax/runlist.sh
index d49ed331c55..d87fc1f933d 100644
--- a/distrib/vax/runlist.sh
+++ b/distrib/vax/runlist.sh
@@ -1,4 +1,4 @@
-#	$Id: runlist.sh,v 1.1 1995/10/18 08:37:54 deraadt Exp $
+#	$Id: runlist.sh,v 1.2 1996/09/05 21:27:34 deraadt Exp $
 
 if [ "X$1" = "X-d" ]; then
 	SHELLCMD=cat