Did some s/NetBSD/OpenBSD/, s/netbsd/bsd/ and $OpenBSD$ additions.

However this stuff is largely related to NetBSD and must be completely
redone, if we will make real relases sometime

19 files changed, 48 insertions, 55 deletions

diff --git a/distrib/i386/floppies/Makefile b/distrib/i386/floppies/Makefile
index 1fa605450ec..eb05fa89834 100644
--- a/distrib/i386/floppies/Makefile
+++ b/distrib/i386/floppies/Makefile
@@ -1,4 +1,4 @@
-#	$Id
+#	$OpenBSD: Makefile,v 1.3 1996/04/25 21:27:57 niklas Exp $
 
 SUBDIR= inst kcadp kcoth upgr
 
diff --git a/distrib/i386/floppies/Makefile.inc b/distrib/i386/floppies/Makefile.inc
index 6c237d0f5b1..98b9d9c8b9c 100644
--- a/distrib/i386/floppies/Makefile.inc
+++ b/distrib/i386/floppies/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.2 1995/11/06 21:27:32 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1996/04/25 21:27:59 niklas Exp $
 
 # Revision is 1.1
 # all these private copies of the version number really lose.
diff --git a/distrib/i386/floppies/inst-common/dot.commonutils b/distrib/i386/floppies/inst-common/dot.commonutils
index 38cee5bb50f..d69cac9805a 100644
--- a/distrib/i386/floppies/inst-common/dot.commonutils
+++ b/distrib/i386/floppies/inst-common/dot.commonutils
@@ -1,3 +1,4 @@
+#       $OpenBSD: dot.commonutils,v 1.4 1996/04/25 21:28:12 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -26,12 +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: dot.commonutils,v 1.3 1995/12/14 07:00:12 deraadt Exp $
 
-# Installation utilites (functions), to get NetBSD installed on
+# Installation utilites (functions), to get OpenBSD installed on
 # the hard disk.  These are meant to be invoked from the shell prompt,
-# by people installing NetBSD.
+# by people installing OpenBSD.
 
 # we know that /etc/fstab is only generated on the hard drive
 dest_dir=/
diff --git a/distrib/i386/floppies/inst/dot.hdprofile b/distrib/i386/floppies/inst/dot.hdprofile
index 77b57a377ee..38b93ee9d15 100644
--- a/distrib/i386/floppies/inst/dot.hdprofile
+++ b/distrib/i386/floppies/inst/dot.hdprofile
@@ -1,3 +1,4 @@
+#	$OpenBSD: dot.hdprofile,v 1.4 1996/04/25 21:28:04 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -26,8 +27,6 @@
 # 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 1995/12/14 07:00:09 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
@@ -58,6 +57,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	. /.commonutils
 	. /.instutils
 
-	echo "Follow the installation directions to install the NetBSD"
+	echo "Follow the installation directions to install the OpenBSD"
 	echo "distribution sets."
 fi
diff --git a/distrib/i386/floppies/inst/dot.instutils b/distrib/i386/floppies/inst/dot.instutils
index 3ccf26a7455..32dfd63af6a 100644
--- a/distrib/i386/floppies/inst/dot.instutils
+++ b/distrib/i386/floppies/inst/dot.instutils
@@ -1,3 +1,4 @@
+#	$OpenBSD: dot.instutils,v 1.2 1996/04/25 21:28:06 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -26,12 +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: dot.instutils,v 1.1 1995/10/18 08:37:34 deraadt Exp $
 
-# Installation configuration utilites (functions), to get NetBSD configured
+# Installation configuration utilites (functions), to get OpenBSD configured
 # reasonably once it is installed on the hard disk.  These are meant to be
-# invoked from the shell prompt, by people installing NetBSD.
+# invoked from the shell prompt, by people installing OpenBSD.
 
 Configure()
 {
diff --git a/distrib/i386/floppies/inst/install.sh b/distrib/i386/floppies/inst/install.sh
index ba4baa44129..da843327d96 100644
--- a/distrib/i386/floppies/inst/install.sh
+++ b/distrib/i386/floppies/inst/install.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+#	$OpenBSD: install.sh,v 1.6 1996/04/25 21:28:08 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -27,10 +28,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: install.sh,v 1.5 1996/02/02 07:24:28 dm Exp $
 
-#	NetBSD installation script.
+#	OpenBSD installation script.
 #	In a perfect world, this would be a nice C program, with a reasonable
 #	user interface.
 
@@ -48,9 +47,9 @@ getresp() {
 	fi
 }
 
-echo	"Welcome to the NetBSD ${VERSION} installation program."
+echo	"Welcome to the OpenBSD ${VERSION} installation program."
 echo	""
-echo	"This program is designed to help you put NetBSD on your hard disk,"
+echo	"This program is designed to help you put OpenBSD 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."
@@ -88,7 +87,7 @@ echo	""
 echo	"To do the installation, you'll need to provide some information about"
 echo	"your disk."
 echo	""
-echo	"NetBSD can be installed on ST506, ESDI, IDE, or SCSI disks."
+echo	"OpenBSD can be installed on ST506, ESDI, IDE, or SCSI disks."
 echo -n	"What kind of disk will you be installing on? [SCSI] "
 getresp "SCSI"
 case "$resp" in
@@ -159,7 +158,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 NetBSD printed when booting."
+echo	"or you should have written down what OpenBSD printed when booting."
 echo	"(Note that he geometry that's printed at boot time is preferred.)"
 echo	""
 echo    "You may choose to view the initial boot messages for your system"
@@ -232,13 +231,13 @@ if [ $sizeunit = "sectors" ]; then
 fi
 
 echo -n ""
-echo -n "Size of NetBSD portion of disk (in $sizeunit)? "
+echo -n "Size of OpenBSD portion of disk (in $sizeunit)? "
 getresp
 partition=$resp
 partition_sects=`expr $resp \* $sizemult`
 part_offset=0
 if [ $partition_sects -lt $disksize ]; then
-	echo -n "Offset of NetBSD portion of disk (in $sizeunit)? "
+	echo -n "Offset of OpenBSD portion of disk (in $sizeunit)? "
 	getresp
 	part_offset=$resp
 fi
@@ -281,7 +280,7 @@ echo	""
 
 swap=0
 while [ $swap -eq 0 ]; do 
-	echo	"$units_left $sizeunit remaining in NetBSD portion of disk."
+	echo	"$units_left $sizeunit remaining in OpenBSD portion of disk."
 	echo -n	"Swap partition size (in $sizeunit)? "
 	getresp
 	case $resp in
@@ -304,7 +303,7 @@ blocksize=8192
 $DONTDOIT mount -u /dev/fd0a /
 cat /etc/disktab.preinstall > $DT
 echo	"" >> $DT
-echo	"$labelname|NetBSD installation generated:\\" >> $DT
+echo	"$labelname|OpenBSD 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
@@ -321,8 +320,8 @@ _offset=`expr $part_offset \* $sizemult`
 echo	"	:pc#${_size}:oc#${_offset}:\\" >> $DT
 
 echo	"You will now have to enter information about any other partitions"
-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	"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	"portion of the disk."
 
 while [ $part_used -lt $partition ]; do
@@ -330,7 +329,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 NetBSD portion of "
+		echo -n	"$units_left $sizeunit remaining in OpenBSD portion of "
 		echo	"the disk"
 		echo -n "Next partition size (in $sizeunit)? "
 		getresp
@@ -390,7 +389,7 @@ sync
 echo	""
 echo	"THIS IS YOUR LAST CHANCE!!!"
 echo	""
-echo -n	"Are you SURE you want NetBSD installed on your hard drive? (yes/no) "
+echo -n	"Are you SURE you want OpenBSD installed on your hard drive? (yes/no) "
 answer=""
 while [ "$answer" = "" ]; do
 	getresp
@@ -486,10 +485,10 @@ echo	"OK!  The preliminary work of setting up your disk is now complete."
 echo 	""
 echo	"The remaining tasks are:"
 echo	""
-echo	"To copy a NetBSD kernel to the hard drive's root filesystem."
+echo	"To copy a OpenBSD kernel to the hard drive's root filesystem."
 echo	"Once accomplished, you can boot off the hard drive."
 echo	""
-echo	"To load and install the NetBSD distribution sets."
+echo	"To load and install the OpenBSD 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/i386/floppies/kc-common/Makefile.inc b/distrib/i386/floppies/kc-common/Makefile.inc
index 18fd4f7bde7..43ed94e8a62 100644
--- a/distrib/i386/floppies/kc-common/Makefile.inc
+++ b/distrib/i386/floppies/kc-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.2 1996/02/02 07:24:33 dm Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1996/04/25 21:28:15 niklas Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
diff --git a/distrib/i386/floppies/kc-common/copy_kernel.sh b/distrib/i386/floppies/kc-common/copy_kernel.sh
index e15c6635f75..502109def23 100644
--- a/distrib/i386/floppies/kc-common/copy_kernel.sh
+++ b/distrib/i386/floppies/kc-common/copy_kernel.sh
@@ -1,4 +1,4 @@
-#	$Id: copy_kernel.sh,v 1.2 1996/02/02 07:24:33 dm Exp $
+#	$OpenBSD: copy_kernel.sh,v 1.3 1996/04/25 21:28:16 niklas Exp $
 #
 #	Kernel copy script
 
@@ -38,7 +38,7 @@ warning() {
 }
 
 trap "cancel;" 2 3
-echo	"NetBSD kernel copy program"
+echo	"OpenBSD kernel copy program"
 echo	""
 echo	"Default answers are displayed in brackets.  You may hit Control-C"
 echo	"at any time to cancel this operation (though if you hit Control-C at"
diff --git a/distrib/i386/floppies/kc-common/dot.profile b/distrib/i386/floppies/kc-common/dot.profile
index cb488010091..79c9fff8c8b 100644
--- a/distrib/i386/floppies/kc-common/dot.profile
+++ b/distrib/i386/floppies/kc-common/dot.profile
@@ -1,4 +1,4 @@
-#	$Id: dot.profile,v 1.1 1995/10/18 08:37:35 deraadt Exp $
+#	$OpenBSD: dot.profile,v 1.2 1996/04/25 21:28:17 niklas Exp $
 
 PATH=/sbin:/bin:/
 export PATH
diff --git a/distrib/i386/floppies/kc-common/kcbin.conf b/distrib/i386/floppies/kc-common/kcbin.conf
index 0a001e2e7cd..04604dafa9b 100644
--- a/distrib/i386/floppies/kc-common/kcbin.conf
+++ b/distrib/i386/floppies/kc-common/kcbin.conf
@@ -1,6 +1,6 @@
+#	$OpenBSD: kcbin.conf,v 1.2 1996/04/25 21:28:18 niklas Exp $	
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: kcbin.conf,v 1.1 1995/10/18 08:37:35 deraadt Exp $	
 #
 
 srcdirs bin sbin
diff --git a/distrib/i386/floppies/kc-common/list b/distrib/i386/floppies/kc-common/list
index 2caf7cd544b..15943b8c336 100644
--- a/distrib/i386/floppies/kc-common/list
+++ b/distrib/i386/floppies/kc-common/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.1 1995/10/18 08:37:35 deraadt Exp $
+#	$OpenBSD: list,v 1.2 1996/04/25 21:28:20 niklas Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/kcbin	kcbin
diff --git a/distrib/i386/floppies/kc-common/mtree.conf b/distrib/i386/floppies/kc-common/mtree.conf
index 513f5b98ed4..c207857bb2d 100644
--- a/distrib/i386/floppies/kc-common/mtree.conf
+++ b/distrib/i386/floppies/kc-common/mtree.conf
@@ -1,4 +1,4 @@
-#	$Id: mtree.conf,v 1.1 1995/10/18 08:37:35 deraadt Exp $
+#	$OpenBSD: mtree.conf,v 1.2 1996/04/25 21:28:21 niklas Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
diff --git a/distrib/i386/floppies/kcoth/Makefile b/distrib/i386/floppies/kcoth/Makefile
index 52fe60c47e0..97fe0360e8a 100644
--- a/distrib/i386/floppies/kcoth/Makefile
+++ b/distrib/i386/floppies/kcoth/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1996/01/12 03:13:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.2 1996/04/25 21:28:24 niklas Exp $
 
 TOP=		${.CURDIR}/..
 
diff --git a/distrib/i386/floppies/kcoth/list b/distrib/i386/floppies/kcoth/list
index 34607129d99..680c650483c 100644
--- a/distrib/i386/floppies/kcoth/list
+++ b/distrib/i386/floppies/kcoth/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.2 1996/02/02 07:24:35 dm Exp $
+#	$OpenBSD: list,v 1.3 1996/04/25 21:28:26 niklas Exp $
 
 # copy the kernel
 COPY	${CURDIR}/../../../../sys/arch/i386/compile/INSTOTHER/bsd	bsd
diff --git a/distrib/i386/floppies/list2sh.awk b/distrib/i386/floppies/list2sh.awk
index 6d7898148ec..91ce5a6879d 100644
--- a/distrib/i386/floppies/list2sh.awk
+++ b/distrib/i386/floppies/list2sh.awk
@@ -1,4 +1,4 @@
-#	$Id: list2sh.awk,v 1.1 1995/10/18 08:37:33 deraadt Exp $
+#	$OpenBSD: list2sh.awk,v 1.2 1996/04/25 21:28:00 niklas Exp $
 
 BEGIN {
 	printf("cd ${CURDIR}\n");
diff --git a/distrib/i386/floppies/runlist.sh b/distrib/i386/floppies/runlist.sh
index 72d01961287..2129c8ea733 100644
--- a/distrib/i386/floppies/runlist.sh
+++ b/distrib/i386/floppies/runlist.sh
@@ -1,4 +1,4 @@
-#	$Id: runlist.sh,v 1.1 1995/10/18 08:37:33 deraadt Exp $
+#	$OpenBSD: runlist.sh,v 1.2 1996/04/25 21:28:01 niklas Exp $
 
 if [ "X$1" = "X-d" ]; then
 	SHELLCMD=cat
diff --git a/distrib/i386/floppies/upgr/dot.hdprofile b/distrib/i386/floppies/upgr/dot.hdprofile
index 65a9cc2a435..deb35d30361 100644
--- a/distrib/i386/floppies/upgr/dot.hdprofile
+++ b/distrib/i386/floppies/upgr/dot.hdprofile
@@ -1,3 +1,4 @@
+#	$OpenBSD: dot.hdprofile,v 1.3 1996/04/25 21:28:28 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -26,8 +27,6 @@
 # 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.2 1995/11/06 21:27:43 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
@@ -57,6 +56,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	. /.commonutils
 	. /.upgrutils
 
-	echo "Follow the installation directions to install the NetBSD"
+	echo "Follow the installation directions to install the OpenBSD"
 	echo "distribution sets."
 fi
diff --git a/distrib/i386/floppies/upgr/dot.upgrutils b/distrib/i386/floppies/upgr/dot.upgrutils
index 3b109730bff..2eb5d1de430 100644
--- a/distrib/i386/floppies/upgr/dot.upgrutils
+++ b/distrib/i386/floppies/upgr/dot.upgrutils
@@ -1,3 +1,4 @@
+#       $OpenBSD: dot.upgrutils,v 1.4 1996/04/25 21:28:30 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -26,12 +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: dot.upgrutils,v 1.3 1995/12/15 12:14:51 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 NetBSD.
+# prompt, by people installing OpenBSD.
 
 Cleanup()
 {
@@ -50,7 +49,7 @@ Cleanup()
 	echo	"Done."
 
 	echo	""
-	echo	"All that's left to do now is to install a new NetBSD kernel"
+	echo	"All that's left to do now is to install a new OpenBSD 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/i386/floppies/upgr/upgrade.sh b/distrib/i386/floppies/upgr/upgrade.sh
index 2db8fbd6d3a..fbfa4c121dc 100644
--- a/distrib/i386/floppies/upgr/upgrade.sh
+++ b/distrib/i386/floppies/upgr/upgrade.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+#	$OpenBSD: upgrade.sh,v 1.4 1996/04/25 21:28:32 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -27,10 +28,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: upgrade.sh,v 1.3 1995/12/14 07:00:15 deraadt Exp $
 
-#	NetBSD upgrade script.
+#	OpenBSD upgrade script.
 #	In a perfect world, this would be a nice C program, with a reasonable
 #	user interface.
 
@@ -48,9 +47,9 @@ getresp() {
 	fi
 }
 
-echo	"Welcome to the NetBSD ${VERSION} upgrade program."
+echo	"Welcome to the OpenBSD ${VERSION} upgrade program."
 echo	""
-echo	"This program is designed to help you put the new version of NetBSD"
+echo	"This program is designed to help you put the new version of OpenBSD"
 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,"
@@ -242,11 +241,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 NetBSD software."
+echo	"and you can now upgrade the actual OpenBSD 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	"NetBSD distribution sets, and how to clean up after the upgrade"
+echo	"OpenBSD distribution sets, and how to clean up after the upgrade"
 echo	"software, when you are done."
 echo	""
 echo	"GOOD LUCK!"