From: niklas Date: Thu, 28 Mar 1996 21:48:12 +0000 (+0000) Subject: From NetBSD: merge of 960317 X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0cac16e246f4e7eff1565fd0f09b1aaecf13ad47;p=openbsd From NetBSD: merge of 960317 --- diff --git a/distrib/atari/inst-common/dot.commonutils b/distrib/atari/inst-common/dot.commonutils index 5fc02760705..41634c9d297 100644 --- a/distrib/atari/inst-common/dot.commonutils +++ b/distrib/atari/inst-common/dot.commonutils @@ -1,5 +1,6 @@ # -# $NetBSD: dot.commonutils,v 1.3 1995/11/28 23:57:12 jtc Exp $ +# $OpenBSD: dot.commonutils,v 1.4 1996/03/28 21:48:12 niklas Exp $ +# $NetBSD: dot.commonutils,v 1.4 1996/02/28 10:06:40 leo Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -30,9 +31,9 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# 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=/ @@ -128,7 +129,7 @@ Extract() esac if [ $snapshot = n ] then - cat "$1".??? | gunzip | + cat "$1".?? | gunzip | (cd $dest_dir ; tar --unlink -xp"$tarverbose"f -) else cat "$1".tar.gz | gunzip | diff --git a/distrib/hp300/miniroot/inst/install.sh b/distrib/hp300/miniroot/inst/install.sh index 01feca07bcc..faa9d0cf61a 100644 --- a/distrib/hp300/miniroot/inst/install.sh +++ b/distrib/hp300/miniroot/inst/install.sh @@ -1,9 +1,13 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.6 1995/11/28 23:57:17 jtc Exp $ +# $OpenBSD: install.sh,v 1.5 1996/03/28 21:48:14 niklas Exp $ +# $NetBSD: install.sh,v 1.7 1996/02/28 00:44:01 thorpej Exp $ # -# Copyright (c) 1995 Jason R. Thorpe. +# Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # +# This code is derived from software contributed to The NetBSD Foundation +# by Jason R. Thorpe. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -14,24 +18,26 @@ # documentation and/or other materials provided with the distribution. # 3. All advertising materials mentioning features or use of this software # must display the following acknowledgement: -# This product includes software developed for the NetBSD Project -# by Jason R. Thorpe. -# 4. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission +# This product includes software developed by the NetBSD +# Foundation, Inc. and its contributors. +# 4. Neither the name of The NetBSD Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# 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. +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. # -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. @@ -394,10 +400,10 @@ md_labeldisk() { md_welcome_banner() { ( echo "" - echo "Welcome to the NetBSD/hp300 ${VERSION} installation program." + echo "Welcome to the OpenBSD/hp300 ${VERSION} installation program." cat << \__welcome_banner_1 -This program is designed to help you install NetBSD on your system in a +This program is designed to help you install OpenBSD on your system in a simple and rational way. You'll be asked several questions, and it would probably be useful to have your disk's hardware manual, the installation notes, and a calculator handy. @@ -437,7 +443,7 @@ __not_going_to_install_1 md_congrats() { cat << \__congratulations_1 -CONGRATULATIONS! You have successfully installed NetBSD! To boot the +CONGRATULATIONS! You have successfully installed OpenBSD! To boot the installed system, enter halt at the command prompt. Once the system has halted, power-cycle the machine in order to load new boot code. Make sure you boot from the root disk. @@ -1453,7 +1459,7 @@ get_timezone echo "done." echo -n "Copying kernel..." - cp /netbsd /mnt/netbsd + cp /bsd /mnt/bsd echo "done." md_installboot ${ROOTDISK} diff --git a/distrib/hp300/miniroot/inst/upgrade.sh b/distrib/hp300/miniroot/inst/upgrade.sh index dba084cf988..252afd6a8d6 100644 --- a/distrib/hp300/miniroot/inst/upgrade.sh +++ b/distrib/hp300/miniroot/inst/upgrade.sh @@ -1,9 +1,13 @@ #!/bin/sh -# $NetBSD: upgrade.sh,v 1.2 1995/11/28 23:57:19 jtc Exp $ +# $OpenBSD: upgrade.sh,v 1.3 1996/03/28 21:48:16 niklas Exp $ +# $NetBSD: upgrade.sh,v 1.3 1996/02/28 00:44:06 thorpej Exp $ # -# Copyright (c) 1995 Jason R. Thorpe. +# Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # +# This code is derived from software contributed to The NetBSD Foundation +# by Jason R. Thorpe. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -14,24 +18,26 @@ # documentation and/or other materials provided with the distribution. # 3. All advertising materials mentioning features or use of this software # must display the following acknowledgement: -# This product includes software developed for the NetBSD Project -# by Jason R. Thorpe. -# 4. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission +# This product includes software developed by the NetBSD +# Foundation, Inc. and its contributors. +# 4. Neither the name of The NetBSD Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# 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. +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. # -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. @@ -111,10 +117,10 @@ md_checkfordisklabel() { md_welcome_banner() { ( echo "" - echo "Welcome to the NetBSD/hp300 ${VERSION} upgrade program." + echo "Welcome to the OpenBSD/hp300 ${VERSION} upgrade program." cat << \__welcome_banner_1 -This program is designed to help you upgrade your NetBSD system in a +This program is designed to help you upgrade your OpenBSD system in a simple and rational way. As a reminder, installing the `etc' binary set is NOT recommended. @@ -148,7 +154,7 @@ __not_going_to_install_1 md_congrats() { cat << \__congratulations_1 -CONGRATULATIONS! You have successfully upgraded NetBSD! To boot the +CONGRATULATIONS! You have successfully upgraded OpenBSD! To boot the installed system, enter halt at the command prompt. Once the system has halted, power-cycle the machine in order to load new boot code. Make sure you boot from the root disk. @@ -1011,7 +1017,7 @@ esac echo "done." echo -n "Copying kernel..." - cp /netbsd /mnt/netbsd + cp /bsd /mnt/bsd echo "done." md_installboot ${ROOTDISK} diff --git a/distrib/i386/floppies/inst-common/instbin.conf b/distrib/i386/floppies/inst-common/instbin.conf index cea5689f330..291ee5edf9e 100644 --- a/distrib/i386/floppies/inst-common/instbin.conf +++ b/distrib/i386/floppies/inst-common/instbin.conf @@ -1,6 +1,6 @@ +# $OpenBSD: instbin.conf,v 1.5 1996/03/28 21:48:17 niklas Exp $ # # kcbin.conf - unified binary for the kc floppy -# $Id: instbin.conf,v 1.4 1996/02/02 07:24:31 dm Exp $ # srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -15,6 +15,7 @@ progs update ln chown chgrp ln gawk awk ln gzip gzcat gunzip +ln less more ln sh -sh # init invokes the shell this way ln test [ ln mount_cd9660 cd9660 diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 440fff8b850..7ecfe0e64c8 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,9 +1,13 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.1 1996/01/06 22:45:13 pk Exp $ +# $OpenBSD: install.sh,v 1.2 1996/03/28 21:48:18 niklas Exp $ +# $NetBSD: install.sh,v 1.2 1996/02/28 00:47:42 thorpej Exp $ # -# Copyright (c) 1995 Jason R. Thorpe. +# Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # +# This code is derived from software contributed to The NetBSD Foundation +# by Jason R. Thorpe. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -14,24 +18,26 @@ # documentation and/or other materials provided with the distribution. # 3. All advertising materials mentioning features or use of this software # must display the following acknowledgement: -# This product includes software developed for the NetBSD Project -# by Jason R. Thorpe. -# 4. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission +# This product includes software developed by the NetBSD +# Foundation, Inc. and its contributors. +# 4. Neither the name of The NetBSD Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# 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. +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. # -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. @@ -409,7 +415,7 @@ install_sets $ALLSETS echo "done." echo -n "Copying kernel..." - cp -p /netbsd /mnt/netbsd + cp -p /bsd /mnt/bsd echo "done." md_installboot ${ROOTDISK} diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 85a081886ce..f4b196861fa 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,9 +1,13 @@ #!/bin/sh -# $NetBSD: install.sub,v 1.1 1996/01/06 22:45:13 pk Exp $ +# $OpenBSD: install.sub,v 1.2 1996/03/28 21:48:19 niklas Exp $ +# $NetBSD: install.sub,v 1.2 1996/02/28 00:47:43 thorpej Exp $ # -# Copyright (c) 1995 Jason R. Thorpe. +# Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # +# This code is derived from software contributed to The NetBSD Foundation +# by Jason R. Thorpe. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -14,24 +18,26 @@ # documentation and/or other materials provided with the distribution. # 3. All advertising materials mentioning features or use of this software # must display the following acknowledgement: -# This product includes software developed for the NetBSD Project -# by Jason R. Thorpe. -# 4. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission +# This product includes software developed by the NetBSD +# Foundation, Inc. and its contributors. +# 4. Neither the name of The NetBSD Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# 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. +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. # -# NetBSD installation/upgrade script - common subroutines. +# OpenBSD installation/upgrade script - common subroutines. VERSION=1.1A export VERSION # XXX needed in subshell @@ -438,7 +444,7 @@ install_common_nfs_cdrom() { _sets=`(cd /mnt2/$1; ls *.tar.gz)` if [ -z "$_sets" ]; then - echo "There are no NetBSD install sets available in \"$1\"" + echo "There are no OpenBSD install sets available in \"$1\"" return fi diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index 24c0d379041..8272fcc9847 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,9 +1,13 @@ #!/bin/sh -# $NetBSD: upgrade.sh,v 1.1 1996/01/06 22:45:15 pk Exp $ +# $OpenBSD: upgrade.sh,v 1.2 1996/03/28 21:48:20 niklas Exp $ +# $NetBSD: upgrade.sh,v 1.2 1996/02/28 00:47:45 thorpej Exp $ # -# Copyright (c) 1995 Jason R. Thorpe. +# Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # +# This code is derived from software contributed to The NetBSD Foundation +# by Jason R. Thorpe. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -14,24 +18,26 @@ # documentation and/or other materials provided with the distribution. # 3. All advertising materials mentioning features or use of this software # must display the following acknowledgement: -# This product includes software developed for the NetBSD Project -# by Jason R. Thorpe. -# 4. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission +# This product includes software developed by the NetBSD +# Foundation, Inc. and its contributors. +# 4. Neither the name of The NetBSD Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# 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. +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. # -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. @@ -299,7 +305,7 @@ esac echo "done." echo -n "Copying kernel..." - cp -p /netbsd /mnt/netbsd + cp -p /bsd /mnt/bsd echo "done." md_installboot ${ROOTDISK} diff --git a/distrib/notes/amiga/hardware b/distrib/notes/amiga/hardware index 1e06c3c23c3..aca7554975b 100644 --- a/distrib/notes/amiga/hardware +++ b/distrib/notes/amiga/hardware @@ -1,10 +1,10 @@ -NetBSD/amiga 1.1 runs on any amiga that has a 68020 or better CPU +OpenBSD/amiga 1.1 runs on any amiga that has a 68020, 68030 or 68040 CPU with some form of FPU and MMU. The minimal configuration requires 4M of RAM and about 65M of disk space. To install the entire system requires much more disk space, and to run X or compile the system, more RAM is recommended. (4M of RAM will actually allow you to compile, however it won't be speedy. X really isn't usable on a -4M system) +4M system.) Here is a table of recommended HD partition sizes for a full install: partition: advise, with X, needed, with X @@ -16,8 +16,8 @@ Here is a table of recommended HD partition sizes for a full install: As you may note the recommended size of /usr is 20M greater than needed. This is to leave room for a kernel source and compile tree -as you will probably want to compile your own kernel. (GENERIC is -large and bulky to accommodate all people). +as you will probably want to compile your own kernel. (GENERIC and +INSTALL are large and bulky to accommodate all people). If you only have 4M of fast memory, you should make your swap partition larger, as your system will be doing much more swapping. diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index 9a4fac1c029..7fa799b6aa2 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,8 +1,13 @@ -# $NetBSD: install.md,v 1.1 1996/01/06 22:42:13 pk Exp $ +# $OpenBSD: install.md,v 1.2 1996/03/28 21:48:22 niklas Exp $ +# $NetBSD: install.md,v 1.2 1996/02/28 00:50:28 thorpej Exp $ # -# Copyright (c) 1995 Jason R. Thorpe. +# +# Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # +# This code is derived from software contributed to The NetBSD Foundation +# by Jason R. Thorpe. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -13,21 +18,23 @@ # documentation and/or other materials provided with the distribution. # 3. All advertising materials mentioning features or use of this software # must display the following acknowledgement: -# This product includes software developed for the NetBSD Project -# by Jason R. Thorpe. -# 4. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission +# This product includes software developed by the NetBSD +# Foundation, Inc. and its contributors. +# 4. Neither the name of The NetBSD Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# 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. +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. # # @@ -109,10 +116,10 @@ md_welcome_banner() { { if [ "$MODE" = "install" ]; then echo "" - echo "Welcome to the NetBSD/sparc ${VERSION} installation program." + echo "Welcome to the OpenBSD/sparc ${VERSION} installation program." cat << \__welcome_banner_1 -This program is designed to help you put NetBSD on your disk, +This program is designed to help you put OpenBSD on your disk, in a simple and rational way. You'll be asked several questions, and it would probably be useful to have your disk's hardware manual, the installation notes, and a calculator handy. @@ -120,10 +127,10 @@ __welcome_banner_1 else echo "" - echo "Welcome to the NetBSD/sparc ${VERSION} upgrade program." + echo "Welcome to the OpenBSD/sparc ${VERSION} upgrade program." cat << \__welcome_banner_2 -This program is designed to help you upgrade your NetBSD system in a +This program is designed to help you upgrade your OpenBSD system in a simple and rational way. As a reminder, installing the `etc' binary set is NOT recommended. @@ -167,7 +174,7 @@ md_congrats() { fi cat << __congratulations_1 -CONGRATULATIONS! You have successfully $what NetBSD! +CONGRATULATIONS! You have successfully $what OpenBSD! To boot the installed system, enter halt at the command prompt. Once the system has halted, reset the machine and boot from the disk. diff --git a/distrib/sun3/common/install.sh b/distrib/sun3/common/install.sh index 3677653d777..de309d01665 100644 --- a/distrib/sun3/common/install.sh +++ b/distrib/sun3/common/install.sh @@ -1,9 +1,13 @@ #!/bin/sh -# $NetBSD: install.sh,v 1.4 1995/11/21 21:18:53 gwr Exp $ +# $OpenBSD: install.sh,v 1.4 1996/03/28 21:48:24 niklas Exp $ +# $NetBSD: install.sh,v 1.5 1996/02/28 00:52:38 thorpej Exp $ # -# Copyright (c) 1995 Jason R. Thorpe. +# Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # +# This code is derived from software contributed to The NetBSD Foundation +# by Jason R. Thorpe. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -14,24 +18,26 @@ # documentation and/or other materials provided with the distribution. # 3. All advertising materials mentioning features or use of this software # must display the following acknowledgement: -# This product includes software developed for the NetBSD Project -# by Jason R. Thorpe. -# 4. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission +# This product includes software developed by the NetBSD +# Foundation, Inc. and its contributors. +# 4. Neither the name of The NetBSD Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# 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. +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY 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. # -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. @@ -149,10 +155,10 @@ md_labeldisk() { # and/or instructions specific to the type of machine. md_welcome_banner() { echo " -Welcome to the NetBSD/sun3 ${VERSION} installation program. +Welcome to the OpenBSD/sun3 ${VERSION} installation program. " ; cat << \__welcome_banner_1 -This program is designed to help you install NetBSD on your system in a +This program is designed to help you install OpenBSD on your system in a simple and rational way. You'll be asked several questions, and it will be useful to have the installation notes and a calculator at hand. @@ -180,7 +186,7 @@ __not_going_to_install_1 md_congrats() { cat << \__congratulations_1 -CONGRATULATIONS! You have successfully installed NetBSD! To boot the +CONGRATULATIONS! You have successfully installed OpenBSD! To boot the installed system, enter 'reboot' at the command prompt. __congratulations_1 @@ -1179,7 +1185,7 @@ get_timezone echo "done." echo -n "Copying kernel..." - cp /netbsd /mnt/netbsd + cp /bsd /mnt/bsd echo "done." md_installboot ${ROOTDISK}