sync to netbsd

25 files changed, 117 insertions, 100 deletions

diff --git a/distrib/pc532/floppies/Makefile.inc b/distrib/pc532/floppies/Makefile.inc
index f520de0e077..9f12ef215fc 100644
--- a/distrib/pc532/floppies/Makefile.inc
+++ b/distrib/pc532/floppies/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.3 1995/12/14 07:00:30 deraadt Exp $
+#	$Id: Makefile.inc,v 1.4 1996/09/05 21:26:44 deraadt Exp $
 
-# Revision is 1.1
-REV=	11
+# Revision is 1.2
+REV=	12
diff --git a/distrib/pc532/floppies/inst-common/Makefile.inc b/distrib/pc532/floppies/inst-common/Makefile.inc
index 8d4a508b1ec..02e21b11d47 100644
--- a/distrib/pc532/floppies/inst-common/Makefile.inc
+++ b/distrib/pc532/floppies/inst-common/Makefile.inc
@@ -1,5 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1996/04/25 21:30:33 niklas Exp $ 
-#	$NetBSD: Makefile.inc,v 1.5 1995/11/28 23:58:56 jtc Exp $ 
+#	$NetBSD: Makefile.inc,v 1.5.4.2 1996/08/07 07:29:42 phil Exp $ 
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -24,7 +23,7 @@ PWDOBJ=		${PWDSRC}/obj
 PWDOBJ=		${PWDSRC}
 .endif
 
-all: bsd
+all: netbsd
 	dd if=/dev/zero of=${IMAGE} bs=18k count=80
 	disklabel -r -w ${.OBJDIR}/${IMAGE} boot3 2>/dev/null
 	-yes|bim -c init -c "add ${MDEC}/boot boot" -c "default 0" \
@@ -32,19 +31,25 @@ all: bsd
 	vnconfig -v -c ${VND_DEV} ${IMAGE}
 	newfs -b 8192 -f 1024 -O -m 0 -o space -i 204800 -c 80 ${VND_RDEV} boot3
 	mount ${VND_DEV} ${MOUNT_POINT}
-	cp bsd ${MOUNT_POINT}/bsd
+	cp netbsd ${MOUNT_POINT}/netbsd
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
 	vnconfig -u ${VND_DEV}
 
-inject.fs: ${CBIN} ${LISTS} bsd.gz 
+inject.fs: ${CBIN} ${LISTS} netbsd.gz 
 	(cd ${PWDSRC}; ${MAKE})
-	${CC} -static -o pwd_mkdb ${PWDOBJ}/*.o
+	${CC} -static -o pwd_mkdb ${PWDOBJ}/*.o -lutil
+.ifndef SD
 	dd if=/dev/zero of=${.TARGET} bs=128k count=16
 	vnconfig -v -c ${VND_DEV} ${.TARGET}
 	newfs -b 8192 -f 1024 -O -m 0 -o space -i 7168 ${VND_RDEV} rd
 	mount ${VND_DEV} ${MOUNT_POINT}
+.else
+	newfs -b 8192 -f 1024 -O -m 0 -o space -i 7168 -s 4096 \
+		-t 1 -u 256 /dev/r${SD}
+	mount /dev/${SD} ${MOUNT_POINT}
+.endif
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
@@ -52,7 +57,11 @@ inject.fs: ${CBIN} ${LISTS} bsd.gz
 	@df -i ${MOUNT_POINT}
 	@echo ""
 	umount ${MOUNT_POINT}
+.ifndef SD
 	vnconfig -u ${VND_DEV}
+.else
+	dd if=/dev/${SD} of=${.TARGET} bs=128k count=16
+.endif
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
@@ -60,7 +69,6 @@ unconfig:
 	-/bin/rm -f ${IMAGE}
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-	(cd ${COMMONDIR}; ${MAKE} download.o)
 	crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
@@ -70,29 +78,29 @@ cloak: ${COMMONDIR}/cloak.c
 
 inject: ${COMMONDIR}/inject.c
 
-bsd.gz:
-	gzip -9 <${ADIR}/compile/DEFAULT/bsd >bsd.gz
-#	cp ${ADIR}/compile/DEFAULT/bsd /var/tmp/$$$$; \
+netbsd.gz:
+	gzip -9 <${ADIR}/compile/DEFAULT/netbsd >netbsd.gz
+#	cp ${ADIR}/compile/DEFAULT/netbsd /var/tmp/$$$$; \
 #		strip /var/tmp/$$$$; \
-#		gzip -9 </var/tmp/$$$$ >bsd.gz; \
+#		gzip -9 </var/tmp/$$$$ >netbsd.gz; \
 #		rm /var/tmp/$$$$
 
 
-bsd.o: inject cloak inject.fs
-	cp ${ADIR}/compile/INSTALL/bsd /var/tmp/$$$$; \
+netbsd.o: inject cloak inject.fs
+	cp ${ADIR}/compile/INSTALL/netbsd /var/tmp/$$$$; \
 		strip /var/tmp/$$$$; \
 		./inject /var/tmp/$$$$ inject.fs; \
-		gzip -9 </var/tmp/$$$$ | ./cloak >bsd.o; \
+		gzip -9 </var/tmp/$$$$ | ./cloak >netbsd.o; \
 		rm /var/tmp/$$$$
 
 go.o: ${COMMONDIR}/go.c
 
-bsd: bsd.o go.o
-	ld -s -z -T 240000 -e _go go.o netbsd.o ${MDEC}/zboot.o -o bsd
+netbsd: netbsd.o go.o
+	ld -s -z -T 240000 -e _go go.o netbsd.o ${MDEC}/zboot.o -o netbsd
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
-	/bin/rm -f bsd* inject* cloak pwd_mkdb
+	/bin/rm -f netbsd* inject* cloak pwd_mkdb
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/distrib/pc532/floppies/inst-common/cloak.c b/distrib/pc532/floppies/inst-common/cloak.c
index 54ccd23694c..3a4a8ccdff8 100644
--- a/distrib/pc532/floppies/inst-common/cloak.c
+++ b/distrib/pc532/floppies/inst-common/cloak.c
@@ -27,7 +27,7 @@
  * (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: cloak.c,v 1.1 1995/10/18 08:37:42 deraadt Exp $
+ *	$Id: cloak.c,v 1.2 1996/09/05 21:26:50 deraadt Exp $
  */
 
 #include <stdio.h>
diff --git a/distrib/pc532/floppies/inst-common/dot.commonutils b/distrib/pc532/floppies/inst-common/dot.commonutils
index 95261cc05d2..6ec69a41cd6 100644
--- a/distrib/pc532/floppies/inst-common/dot.commonutils
+++ b/distrib/pc532/floppies/inst-common/dot.commonutils
@@ -1,4 +1,3 @@
-#	$OpenBSD: dot.commonutils,v 1.5 1996/06/29 05:54:20 tholo 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.6 1996/09/05 21:26:51 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.
 
 # we know that /etc/fstab is only generated on the hard drive
 dest_dir=/
@@ -39,7 +40,7 @@ if [ ! -f /etc/fstab ]; then
 fi
 
 # counter for possible shared library confusion
-TAR=/bin/tar
+TAR=/usr/bin/tar
 GUNZIP=/usr/bin/gunzip
 
 Set_tmp_dir()
@@ -110,7 +111,7 @@ Load_tape()
 	echo -n "continue..."
 	read foo
 	echo	"Extracting files from the tape..."
-	$TAR -xvpf /dev/$which
+	$TAR --unlink -xvpf /dev/$which
 	echo	"Done."
 }
 
@@ -127,7 +128,7 @@ Extract()
 		tarverbose=
 		;;
 	esac
-	cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR -xp"$tarverbose"f - )
+	cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR  --unlink -xp"$tarverbose"f - )
 }
 
 xd()
diff --git a/distrib/pc532/floppies/inst-common/download.c b/distrib/pc532/floppies/inst-common/download.c
index 77ce907136b..35081488753 100644
--- a/distrib/pc532/floppies/inst-common/download.c
+++ b/distrib/pc532/floppies/inst-common/download.c
@@ -1,14 +1,13 @@
-/*	$OpenBSD: download.c,v 1.2 1996/04/25 21:30:37 niklas Exp $	*/
 /*	$NetBSD: download.c,v 1.1 1995/10/06 21:00:16 phil Exp $	*/
 
 /*
-   Hacked by Phil Nelson for use with OpenBSD, 10/5/95.
+   Hacked by Phil Nelson for use with NetBSD, 10/5/95.
    This source is in the public domain except for the makeraw function.
 
    The upload part of this program is taken from Bruce's ROM debugger
    code.
 
-   For OpenBSD, the usages are:
+   For NetBSD, the usages are:
 
        download file 
               - open "file" and ship it out standard output with the
diff --git a/distrib/pc532/floppies/inst-common/go.c b/distrib/pc532/floppies/inst-common/go.c
index 43be4735473..c2f0f2bbfb4 100644
--- a/distrib/pc532/floppies/inst-common/go.c
+++ b/distrib/pc532/floppies/inst-common/go.c
@@ -1,5 +1,3 @@
-/*	$OpenBSD: go.c,v 1.2 1996/04/25 21:30:41 niklas Exp $	*/
-
 /*
  * Copyright (c) 1995 Matthias Pfaller.
  * All rights reserved.
@@ -28,17 +26,19 @@
  * 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: go.c,v 1.3 1996/09/05 21:26:53 deraadt Exp $
  */
 
 #include <sys/reboot.h>
 register r6 asm("r6");
 
 /*
- * In order to install OpenBSD on 4mb machines, OpenBSD must survive an
- * overflow of the real kernel into the bsd image. So the compressed kernel
- * image has to be linked in front of the uncompressing code. This code
- * fragment sets the default root disk to rd0 and then jumps behind the
- * compressed kernel image.
+ * In order to install netbsd on 4mb machines, netbsd must survive an overflow
+ * of the real kernel into the netbsd image. So the compressed kernel image
+ * has to be linked in front of the uncompressing code. This code fragment
+ * sets the default root disk to rd0 and then jumps behind the compressed
+ * kernel image.
  */
 
 go()
diff --git a/distrib/pc532/floppies/inst-common/inject.c b/distrib/pc532/floppies/inst-common/inject.c
index d5dd4bcc0f0..60d3eb01183 100644
--- a/distrib/pc532/floppies/inst-common/inject.c
+++ b/distrib/pc532/floppies/inst-common/inject.c
@@ -27,7 +27,7 @@
  * (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: inject.c,v 1.1 1995/10/18 08:37:42 deraadt Exp $
+ *	$Id: inject.c,v 1.2 1996/09/05 21:26:54 deraadt Exp $
  */
 
 #include <stdio.h>
diff --git a/distrib/pc532/floppies/inst-common/instbin.conf b/distrib/pc532/floppies/inst-common/instbin.conf
index b84feb96d3e..3fc34c29390 100644
--- a/distrib/pc532/floppies/inst-common/instbin.conf
+++ b/distrib/pc532/floppies/inst-common/instbin.conf
@@ -1,28 +1,32 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.4 1996/06/29 05:54:21 tholo Exp $	
+# $Id: instbin.conf,v 1.5 1996/09/05 21:26:55 deraadt Exp $	
 #
 
-srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin games
+srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin games distrib/pc532/floppies
 
-progs basename bc bim cat chat chmod chown chroot cp
-progs date dd df dirname disklabel dmesg domainname download dump 
-progs expr factor find fsck ftp
-progs gawk gzip hostname hexdump ifconfig init 
-progs kill kvm_mkdb ln ls mkdir mknod more
+progs chat download less pppstats vi
+progs basename bc bim cat chmod chown chroot cp
+progs date dd df dirname disklabel dmesg domainname dump 
+progs expr factor find fsck_ffs ftp
+progs gzip hostname hexdump ifconfig init 
+progs kill kvm_mkdb ln ls mkdir mknod
 progs mount mount_cd9660 mount_ffs mount_msdos mount_nfs mt mv netstat newfs
-progs pax ping pppd pppstats ps pwd rcp reboot restore rm rmdir route
+progs ping pppd ps pwd rcp reboot restore rm rmdir route
 progs sed sh slattach strings stty swapon sync sysctl 
-progs test tip traceroute umount update vi
+progs tar test tip traceroute umount update
 
-special chat srcdir /usr/src/usr.sbin/pppd/chat
-special pppstats srcdir /usr/src/usr.sbin/pppd/pppstats
-special vi srcdir /usr/src/usr.bin/vi/common
-special download srcdir /usr/src/distrib/pc532/floppies/inst-common
+special chat srcdir usr.sbin/pppd/chat
+special download srcdir distrib/pc532/floppies/inst-common
+special download objs download.o
+special pppstats srcdir usr.sbin/pppd/pppstats
+special less srcdir usr.bin/less/less
+special vi srcdir usr.bin/vi/build
 
+ln fsck_ffs fsck
+ln less more
 ln chown chgrp
 ln dump rdump
-ln gawk awk
 ln gzip gzcat gunzip
 ln sh -sh		# init invokes the shell this way
 ln test [
@@ -30,7 +34,6 @@ ln mount_cd9660 cd9660
 ln mount_ffs ffs
 ln mount_msdos msdos
 ln mount_nfs nfs
-ln pax tar
 ln restore rrestore
 ln vi ex
 ln vi view
diff --git a/distrib/pc532/floppies/inst-common/list b/distrib/pc532/floppies/inst-common/list
index ad54d5b3c3b..6e5605e96a4 100644
--- a/distrib/pc532/floppies/inst-common/list
+++ b/distrib/pc532/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.5 1996/06/29 05:54:21 tholo Exp $
+#	$Id: list,v 1.6 1996/09/05 21:26:56 deraadt Exp $
 
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
@@ -19,7 +19,7 @@ SPECIAL	/usr/sbin/chroot . ./pwd_mkdb -p /etc/master.passwd
 SPECIAL	/bin/rm pwd_mkdb
 
 # copy the crunched binary, link to it
-COPY	${OBJDIR}/bsd.gz	bsd.gz
+COPY	${OBJDIR}/netbsd.gz	netbsd.gz
 COPY	${OBJDIR}/instbin	instbin
 LINK	instbin			bin/cat
 LINK	instbin			bin/chmod
@@ -44,7 +44,6 @@ LINK	instbin			bin/rmdir
 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/bim
@@ -71,7 +70,6 @@ LINK	instbin			sbin/rrestore
 LINK	instbin			sbin/slattach
 LINK	instbin			sbin/swapon
 LINK	instbin			sbin/umount
-SYMLINK	/instbin		usr/bin/awk
 SYMLINK	/instbin		usr/bin/basename
 SYMLINK	/instbin		usr/bin/chgrp
 SYMLINK	/instbin		usr/bin/dirname
@@ -83,9 +81,11 @@ SYMLINK	/instbin		usr/bin/gunzip
 SYMLINK	/instbin		usr/bin/gzcat
 SYMLINK	/instbin		usr/bin/gzip
 SYMLINK	/instbin		usr/bin/more
+SYMLINK	/instbin		usr/bin/less
 SYMLINK	/instbin		usr/bin/netstat
 SYMLINK	/instbin		usr/bin/sed
 SYMLINK	/instbin		usr/bin/strings
+SYMLINK	/instbin		usr/bin/tar
 SYMLINK	/instbin		usr/bin/tip
 SYMLINK /instbin		usr/bin/vi
 SYMLINK /instbin		usr/bin/view
diff --git a/distrib/pc532/floppies/inst-common/memory_map b/distrib/pc532/floppies/inst-common/memory_map
index a694259dbd3..2017799dfd7 100644
--- a/distrib/pc532/floppies/inst-common/memory_map
+++ b/distrib/pc532/floppies/inst-common/memory_map
@@ -1,5 +1,5 @@
 0x400000 Top of physical RAM for 4mb machine
 0x3EB800 Start of boot code
 0x288000 Start of ramdisk when booting from rd0
-0x240000 Start of bsd image (may overflow into rd0 image)
-0x002000 Start of kernel (may overflow into bsd image)
+0x240000 Start of netbsd image (may overflow into rd0 image)
+0x002000 Start of kernel (may overflow into netbsd image)
diff --git a/distrib/pc532/floppies/inst-common/mtree.conf b/distrib/pc532/floppies/inst-common/mtree.conf
index 4ff0f5df78b..e9f97cf01d4 100644
--- a/distrib/pc532/floppies/inst-common/mtree.conf
+++ b/distrib/pc532/floppies/inst-common/mtree.conf
@@ -1,4 +1,4 @@
-#	$Id: mtree.conf,v 1.2 1995/12/14 07:00:37 deraadt Exp $
+#	$Id: mtree.conf,v 1.3 1996/09/05 21:26:58 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
diff --git a/distrib/pc532/floppies/inst/Makefile b/distrib/pc532/floppies/inst/Makefile
index b72b0db71df..39857a5135d 100644
--- a/distrib/pc532/floppies/inst/Makefile
+++ b/distrib/pc532/floppies/inst/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1995/10/18 08:37:43 deraadt Exp $
+#	$Id: Makefile,v 1.2 1996/09/05 21:26:46 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
diff --git a/distrib/pc532/floppies/inst/dot.hdprofile b/distrib/pc532/floppies/inst/dot.hdprofile
index ecbb469f077..40439ecec0b 100644
--- a/distrib/pc532/floppies/inst/dot.hdprofile
+++ b/distrib/pc532/floppies/inst/dot.hdprofile
@@ -1,4 +1,3 @@
-#	$OpenBSD: dot.hdprofile,v 1.2 1996/04/25 21:30:26 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -27,6 +26,8 @@
 # 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.hdprofile,v 1.3 1996/09/05 21:26:46 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/usr/games:/
 export PATH
@@ -56,6 +57,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	. /.commonutils
 	. /.instutils
 
-	echo "Follow the installation directions to install the OpenBSD"
+	echo "Follow the installation directions to install the NetBSD"
 	echo "distribution sets."
 fi
diff --git a/distrib/pc532/floppies/inst/dot.instutils b/distrib/pc532/floppies/inst/dot.instutils
index 57d8d75fab5..8479f4cb05f 100644
--- a/distrib/pc532/floppies/inst/dot.instutils
+++ b/distrib/pc532/floppies/inst/dot.instutils
@@ -1,4 +1,3 @@
-#	$OpenBSD: dot.instutils,v 1.2 1996/04/25 21:30:28 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.instutils,v 1.3 1996/09/05 21:26:47 deraadt Exp $
 
-# Installation configuration utilites (functions), to get OpenBSD configured
+# Installation configuration utilites (functions), to get NetBSD configured
 # reasonably once it is installed on the hard disk.  These are meant to be
-# invoked from the shell prompt, by people installing OpenBSD.
+# invoked from the shell prompt, by people installing NetBSD.
 
 Configure()
 {
diff --git a/distrib/pc532/floppies/inst/dot.profile b/distrib/pc532/floppies/inst/dot.profile
index 2f597b89b8f..44532b4f87e 100644
--- a/distrib/pc532/floppies/inst/dot.profile
+++ b/distrib/pc532/floppies/inst/dot.profile
@@ -27,7 +27,7 @@
 # (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.profile,v 1.1 1995/10/18 08:37:43 deraadt Exp $
+#       $Id: dot.profile,v 1.2 1996/09/05 21:26:47 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/usr/games:/
 export PATH
diff --git a/distrib/pc532/floppies/inst/install.sh b/distrib/pc532/floppies/inst/install.sh
index 83fc6fbc02d..5b43b3b4e5e 100644
--- a/distrib/pc532/floppies/inst/install.sh
+++ b/distrib/pc532/floppies/inst/install.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.5 1996/06/29 05:54:20 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -27,8 +26,10 @@
 # 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: install.sh,v 1.6 1996/09/05 21:26:48 deraadt Exp $
 
-#	OpenBSD installation script.
+#	NetBSD installation script.
 #	In a perfect world, this would be a nice C program, with a reasonable
 #	user interface.
 
@@ -46,9 +47,9 @@ getresp() {
 	fi
 }
 
-echo	"Welcome to the OpenBSD ${VERSION} installation program."
+echo	"Welcome to the NetBSD ${VERSION} installation program."
 echo	""
-echo	"This program is designed to help you put OpenBSD on your hard disk,"
+echo	"This program is designed to help you put NetBSD on your hard disk,"
 echo	"in a simple and rational way.  You'll be asked several questions,"
 echo	"and it would probably be useful to have your disk's hardware"
 echo	"manual, the installation notes, and a calculator handy."
@@ -132,7 +133,7 @@ labelname=$resp
 echo	""
 echo	"You will now need to provide some information about your disk's"
 echo	"geometry.  This should either be in the User's Manual for your disk,"
-echo	"or you should have written down what OpenBSD printed when booting."
+echo	"or you should have written down what NetBSD printed when booting."
 echo	"(Note that he geometry that's printed at boot time is preferred.)"
 echo	""
 echo -n	"Number of bytes per disk sector? [512] "
@@ -229,7 +230,7 @@ echo	""
 
 swap=0
 while [ $swap -eq 0 ]; do 
-	echo	"$units_left $sizeunit remaining in OpenBSD portion of disk."
+	echo	"$units_left $sizeunit remaining in NetBSD portion of disk."
 	echo -n	"Swap partition size (in $sizeunit)? "
 	getresp
 	case $resp in
@@ -250,7 +251,7 @@ echo	""
 
 boot=0
 while [ $boot -eq 0 ]; do 
-	echo	"$units_left $sizeunit remaining in OpenBSD portion of disk."
+	echo	"$units_left $sizeunit remaining in NetBSD portion of disk."
 	echo -n	"Boot partition size (in $sizeunit)? "
 	getresp
 	case $resp in
@@ -273,7 +274,7 @@ blocksize=8192
 $DONTDOIT mount -u /dev/rd0 /
 cat /etc/disktab.preinstall > $DT
 echo	"" >> $DT
-echo	"$labelname|OpenBSD installation generated:\\" >> $DT
+echo	"$labelname|NetBSD installation generated:\\" >> $DT
 echo	"	:dt=${type}:ty=winchester:\\" >> $DT
 echo -n	"	:nc#${cyls_per_disk}:ns#${sects_per_track}" >> $DT
 echo	":nt#${tracks_per_cyl}:\\" >> $DT
@@ -293,8 +294,8 @@ _offset=`expr $boot_offset \* $sizemult`
 echo	"	:ph#${_size}:oh#${_offset}:th=boot:\\" >> $DT
 
 echo	"You will now have to enter information about any other partitions"
-echo	"to be created in the OpenBSD portion of the disk.  This process will"
-echo	"be complete when you've filled up all remaining space in the OpenBSD"
+echo	"to be created in the NetBSD portion of the disk.  This process will"
+echo	"be complete when you've filled up all remaining space in the NetBSD"
 echo	"portion of the disk."
 
 while [ $part_used -lt $partition ]; do
@@ -302,7 +303,7 @@ while [ $part_used -lt $partition ]; do
 	units_left=`expr $partition - $part_used`
 	while [ $part_size -eq 0 ]; do
 		echo	""
-		echo -n	"$units_left $sizeunit remaining in OpenBSD portion of "
+		echo -n	"$units_left $sizeunit remaining in NetBSD portion of "
 		echo	"the disk"
 		echo -n "Next partition size (in $sizeunit)? "
 		getresp
@@ -362,7 +363,7 @@ sync
 echo	""
 echo	"THIS IS YOUR LAST CHANCE!!!"
 echo	""
-echo -n	"Are you SURE you want OpenBSD installed on your hard drive? (yes/no) "
+echo -n	"Are you SURE you want NetBSD installed on your hard drive? (yes/no) "
 answer=""
 while [ "$answer" = "" ]; do
 	getresp
@@ -432,9 +433,9 @@ fi
 
 echo	""
 echo    "Populating filesystems with bootstrapping binaries and config files"
-$DONTDOIT tar -cfX - . | (cd /mnt ; tar -xpf - )
+$DONTDOIT tar --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - )
 $DONTDOIT cp /tmp/.hdprofile /mnt/.profile
-$DONTDOIT gzip -d /mnt/bsd.gz
+$DONTDOIT gzip -d /mnt/netbsd.gz
 
 echo	""
 echo -n	"Creating an fstab..."
@@ -464,7 +465,7 @@ echo	"You can now boot off the hard drive."
 echo 	""
 echo	"The remaining tasks are:"
 echo	""
-echo	"To load and install the OpenBSD distribution sets."
+echo	"To load and install the NetBSD distribution sets."
 echo	"Currently the hard drive's root filesystem is mounted on /mnt"
 echo	""
 echo	"Consult the installation notes which will describe how to"
diff --git a/distrib/pc532/floppies/inst/list b/distrib/pc532/floppies/inst/list
index 96ff20acdb5..d28acb11460 100644
--- a/distrib/pc532/floppies/inst/list
+++ b/distrib/pc532/floppies/inst/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.1 1995/10/18 08:37:43 deraadt Exp $
+#	$Id: list,v 1.2 1996/09/05 21:26:48 deraadt Exp $
 
 # the disktab explanation file
 COPY	disktab.preinstall		etc
diff --git a/distrib/pc532/floppies/list2sh.awk b/distrib/pc532/floppies/list2sh.awk
index 3155014e722..e857fdf7c98 100644
--- a/distrib/pc532/floppies/list2sh.awk
+++ b/distrib/pc532/floppies/list2sh.awk
@@ -1,4 +1,4 @@
-#	$Id: list2sh.awk,v 1.1 1995/10/18 08:37:41 deraadt Exp $
+#	$Id: list2sh.awk,v 1.2 1996/09/05 21:26:44 deraadt Exp $
 
 BEGIN {
 	printf("cd ${CURDIR}\n");
diff --git a/distrib/pc532/floppies/runlist.sh b/distrib/pc532/floppies/runlist.sh
index 1e5bde71da0..b8c956b8cbb 100644
--- a/distrib/pc532/floppies/runlist.sh
+++ b/distrib/pc532/floppies/runlist.sh
@@ -1,4 +1,4 @@
-#	$Id: runlist.sh,v 1.1 1995/10/18 08:37:41 deraadt Exp $
+#	$Id: runlist.sh,v 1.2 1996/09/05 21:26:45 deraadt Exp $
 
 if [ "X$1" = "X-d" ]; then
 	SHELLCMD=cat
diff --git a/distrib/pc532/floppies/upgr/Makefile b/distrib/pc532/floppies/upgr/Makefile
index 246d91c455f..c5b9660514a 100644
--- a/distrib/pc532/floppies/upgr/Makefile
+++ b/distrib/pc532/floppies/upgr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1995/10/18 08:37:43 deraadt Exp $
+#	$Id: Makefile,v 1.2 1996/09/05 21:27:00 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
diff --git a/distrib/pc532/floppies/upgr/dot.hdprofile b/distrib/pc532/floppies/upgr/dot.hdprofile
index c516921d862..e5428ac9a2d 100644
--- a/distrib/pc532/floppies/upgr/dot.hdprofile
+++ b/distrib/pc532/floppies/upgr/dot.hdprofile
@@ -1,4 +1,3 @@
-#	$OpenBSD: dot.hdprofile,v 1.2 1996/04/25 21:30:52 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -27,6 +26,8 @@
 # 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.hdprofile,v 1.3 1996/09/05 21:27:01 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
@@ -56,6 +57,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	. /.commonutils
 	. /.upgrutils
 
-	echo "Follow the installation directions to install the OpenBSD"
+	echo "Follow the installation directions to install the NetBSD"
 	echo "distribution sets."
 fi
diff --git a/distrib/pc532/floppies/upgr/dot.profile b/distrib/pc532/floppies/upgr/dot.profile
index 6d3172db208..5e62fae9684 100644
--- a/distrib/pc532/floppies/upgr/dot.profile
+++ b/distrib/pc532/floppies/upgr/dot.profile
@@ -27,7 +27,7 @@
 # (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.profile,v 1.1 1995/10/18 08:37:43 deraadt Exp $
+#       $Id: dot.profile,v 1.2 1996/09/05 21:27:02 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
diff --git a/distrib/pc532/floppies/upgr/dot.upgrutils b/distrib/pc532/floppies/upgr/dot.upgrutils
index f3b614ad163..431f5e41987 100644
--- a/distrib/pc532/floppies/upgr/dot.upgrutils
+++ b/distrib/pc532/floppies/upgr/dot.upgrutils
@@ -1,4 +1,3 @@
-#	$OpenBSD: dot.upgrutils,v 1.2 1996/04/25 21:30:56 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.upgrutils,v 1.3 1996/09/05 21:27:03 deraadt Exp $
 
 # Upgrade cleanup utilites (functions), to make sure a recently-upgraded
 # system is safely runnable.  These are meant to be invoked from the shell
-# prompt, by people installing OpenBSD.
+# prompt, by people installing NetBSD.
 
 Cleanup()
 {
@@ -48,7 +49,7 @@ Cleanup()
 	echo	"Done."
 
 	echo	""
-	echo	"All that's left to do now is to install a new OpenBSD kernel"
+	echo	"All that's left to do now is to install a new NetBSD kernel"
 	echo	"on your hard disk.  You should now halt your machine using"
 	echo	"the 'halt' command.  Once the machine is halted, replace the"
 	echo	"installation floppy with the kernel-copy floppy and hit any"
diff --git a/distrib/pc532/floppies/upgr/list b/distrib/pc532/floppies/upgr/list
index e4be825d30a..10cb3c3a1db 100644
--- a/distrib/pc532/floppies/upgr/list
+++ b/distrib/pc532/floppies/upgr/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.1 1995/10/18 08:37:43 deraadt Exp $
+#	$Id: list,v 1.2 1996/09/05 21:27:04 deraadt Exp $
 
 # and the upgrade tools
 COPY	dot.profile			.profile
diff --git a/distrib/pc532/floppies/upgr/upgrade.sh b/distrib/pc532/floppies/upgr/upgrade.sh
index 645dccac5a2..9a89cb332b1 100644
--- a/distrib/pc532/floppies/upgr/upgrade.sh
+++ b/distrib/pc532/floppies/upgr/upgrade.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-#	$OpenBSD: upgrade.sh,v 1.3 1996/06/29 05:54:21 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -28,8 +27,10 @@
 # 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: upgrade.sh,v 1.4 1996/09/05 21:27:06 deraadt Exp $
 
-#	OpenBSD upgrade script.
+#	NetBSD upgrade script.
 #	In a perfect world, this would be a nice C program, with a reasonable
 #	user interface.
 
@@ -47,9 +48,9 @@ getresp() {
 	fi
 }
 
-echo	"Welcome to the OpenBSD ${VERSION} upgrade program."
+echo	"Welcome to the NetBSD ${VERSION} upgrade program."
 echo	""
-echo	"This program is designed to help you put the new version of OpenBSD"
+echo	"This program is designed to help you put the new version of NetBSD"
 echo	"on your hard disk, in a simple and rational way.  To upgrade, you"
 echo	"must have plenty of free space on all partitions which will be"
 echo	"upgraded.  If you have at least 1MB free on your root partition,"
@@ -229,7 +230,7 @@ echo	"Done."
 echo	""
 echo	"Copying bootstrapping binaries and config files to the hard drive..."
 $DONTDOIT cp /mnt/.profile /mnt/.profile.bak
-$DONTDOIT pax -rw -X -k . /mnt
+$DONTDOIT tar --exclude etc --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - )
 $DONTDOIT mv /mnt/etc/rc /mnt/etc/rc.bak
 $DONTDOIT cp /tmp/.hdprofile /mnt/.profile
 
@@ -241,11 +242,11 @@ echo	"Done."
 echo    ""
 echo    ""
 echo	"OK!  The preliminary work of setting up your disk is now complete,"
-echo	"and you can now upgrade the actual OpenBSD software."
+echo	"and you can now upgrade the actual NetBSD software."
 echo	""
 echo	"Right now, your hard disk is mounted on /mnt.  You should consult"
 echo	"the installation notes to determine how to load and install the new"
-echo	"OpenBSD distribution sets, and how to clean up after the upgrade"
+echo	"NetBSD distribution sets, and how to clean up after the upgrade"
 echo	"software, when you are done."
 echo	""
 echo	"GOOD LUCK!"