diff options
117 files changed, 729 insertions, 885 deletions
diff --git a/distrib/alpha/README.files b/distrib/alpha/README.files index 00cb47e4afd..e3766e337a4 100644 --- a/distrib/alpha/README.files +++ b/distrib/alpha/README.files @@ -1,3 +1,4 @@ +$OpenBSD: README.files,v 1.3 1996/04/25 21:27:17 niklas Exp $ $NetBSD: README.files,v 1.3 1995/12/21 02:40:49 cgd Exp $ README.files This list. @@ -9,7 +10,7 @@ In each directory: README_FIRST Important last-minute notes about the snapshot. README Installation notes; probably incomplete. -STATUS Status of NetBSD/Alpha. +STATUS Status of OpenBSD/Alpha. TODO.users Things that I think users could do to help out. bin/ Directory with binaries for this snapshot. @@ -17,10 +18,10 @@ bin/ Directory with binaries for this snapshot. bin.tar.gz Everything on the disk image except /etc, /usr/X11R6, /boot, and the kernel. etc.tar.gz /etc from the disk image. - netbsd.gz Gzipped GENERIC kernel (also on disk image). - netbsd.gdb.gz Gzipped GENERIC kernel w/debugging symbols. - netbsd_nfs.gz Gzipped GENERIC_NFS kernel. - netbsd_nfs.gdb.gz Gzipped GENERIC_NFS kernel w/debugging symbols. + bsd.gz Gzipped GENERIC kernel (also on disk image). + bsd.gdb.gz Gzipped GENERIC kernel w/debugging symbols. + bsd_nfs.gz Gzipped GENERIC_NFS kernel. + bsd_nfs.gdb.gz Gzipped GENERIC_NFS kernel w/debugging symbols. rz25-image.gz Disk image, of an RZ25, for installation. x11.tar.gz /usr/X11R6 from the disk image. @@ -32,5 +33,5 @@ src/ Directory with sources for this snapshot. cygnus.tar.gz Toolchain (gcc, gas, ld, etc.) sources used to build the compiler toolchain. sys.tar.gz Kernel sources. - userland-diffs.gz Diffs from the NetBSD-current user-land + userland-diffs.gz Diffs from the OpenBSD-current user-land sources used to build the distribution. diff --git a/distrib/alpha/rz25dist/Makefile b/distrib/alpha/rz25dist/Makefile index 2f675c4ec23..bebace2b149 100644 --- a/distrib/alpha/rz25dist/Makefile +++ b/distrib/alpha/rz25dist/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.4 1996/04/25 21:27:25 niklas Exp $ # $NetBSD: Makefile,v 1.12 1995/12/21 14:22:25 cgd Exp $ # Make a distribution for the alpha, on a spare disk. @@ -33,7 +34,7 @@ build-fs: cd ${.CURDIR}/../../../cygnus && \ make prefix=${DESTDIR}/usr/local install cd ${.CURDIR}/../../../xc && make install install.man - cp ${.CURDIR}/../../../sys/arch/alpha/compile/GENERIC/netbsd ${DESTDIR} + cp ${.CURDIR}/../../../sys/arch/alpha/compile/GENERIC/bsd ${DESTDIR} ln -s gcc ${DESTDIR}/usr/local/bin/cc ln -s \ ../local/lib/gcc-lib/alpha-unknown-netbsd1.1A./2.7-95q4/cpp \ @@ -64,7 +65,7 @@ rz25-image.gz: mount-fs build-fs unmount-fs bin.tar.gz: mount-fs build-fs /bin/rm -f $@ (cd ${DESTDIR} ; find . | grep -v '^./etc' | \ - grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \ + grep -v '^./usr/X11R6' | grep -v '^./bsd' | \ grep -v '^./boot' | pax -w -d | gzip -9) > $@ etc.tar.gz: mount-fs build-fs diff --git a/distrib/amiga/floppies/inst/dot.instutils b/distrib/amiga/floppies/inst/dot.instutils index c7838872244..9b0568b449a 100644 --- a/distrib/amiga/floppies/inst/dot.instutils +++ b/distrib/amiga/floppies/inst/dot.instutils @@ -1,3 +1,4 @@ +# $OpenBSD: dot.instutils,v 1.3 1996/04/25 21:27:28 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. -# -# $OpenBSD: dot.instutils,v 1.2 1996/04/25 02:35:49 mickey 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() { @@ -146,7 +145,7 @@ Configure() sync echo "" - echo "All that's left to do now is to install the NetBSD kernel on" + echo "All that's left to do now is to install the OpenBSD kernel on" echo "your hard disk. You should now halt your machine using the" echo "'halt' command. Once the machine is halted, reboot it" } diff --git a/distrib/amiga/floppies/inst/install.sh b/distrib/amiga/floppies/inst/install.sh index b98e9f02ead..01cf3bb48c6 100644 --- a/distrib/amiga/floppies/inst/install.sh +++ b/distrib/amiga/floppies/inst/install.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: install.sh,v 1.3 1996/04/25 21:27:30 niklas Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -27,8 +28,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. -# -# $OpenBSD: install.sh,v 1.2 1996/04/25 02:35:51 mickey Exp $ # OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable @@ -94,9 +93,9 @@ prepdrive() { esac } -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. Its main objective is to format," echo "mount and create an fstab for your root (/) and user (/usr)" echo "partitions." @@ -173,7 +172,7 @@ echo "" echo "THIS IS YOUR LAST CHANCE!!!" echo "" echo "(answering yes will format your root partition on $rdev)" -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 @@ -280,11 +279,11 @@ echo " done." echo "" echo "" echo "OK! The preliminary work of setting up your disk is now complete," -echo "and you can install the actual NetBSD software." +echo "and you can install the actual OpenBSD software." echo "" echo "Right now, your root is mounted on /mnt and your usr on /mnt/usr." echo "You should consult the installation notes to determine how to load" -echo "and install the NetBSD distribution sets, and how to configure your" +echo "and install the OpenBSD distribution sets, and how to configure your" echo "system when you are done." echo "" echo "GOOD LUCK!" diff --git a/distrib/amiga/floppies/inst/list b/distrib/amiga/floppies/inst/list index 7616ecde6b7..42c05c2067e 100644 --- a/distrib/amiga/floppies/inst/list +++ b/distrib/amiga/floppies/inst/list @@ -1,10 +1,10 @@ -# $Open: list,v 1.3 1995/12/14 06:59:49 deraadt Exp $ +# $OpenBSD: list,v 1.5 1996/04/25 21:27:32 niklas Exp $ # the disktab explanation file COPY disktab.preinstall etc # copy the kernel -COPY ${CURDIR}/../../../../sys/arch/amiga/compile/INSTALL/netbsd netbsd +COPY ${CURDIR}/../../../../sys/arch/amiga/compile/INSTALL/bsd bsd # and the installation tools COPY dot.profile .profile diff --git a/distrib/amiga/floppies/upgr/dot.hdprofile b/distrib/amiga/floppies/upgr/dot.hdprofile index f45607c04b1..a715cb3f467 100644 --- a/distrib/amiga/floppies/upgr/dot.hdprofile +++ b/distrib/amiga/floppies/upgr/dot.hdprofile @@ -1,3 +1,4 @@ +# $OpenBSD: dot.hdprofile,v 1.3 1996/04/25 21:27:35 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. -# -# $OpenBSD: dot.hdprofile,v 1.2 1996/04/25 02:36:05 mickey 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/amiga/floppies/upgr/dot.upgrutils b/distrib/amiga/floppies/upgr/dot.upgrutils index 62790e27bc2..81de9356e97 100644 --- a/distrib/amiga/floppies/upgr/dot.upgrutils +++ b/distrib/amiga/floppies/upgr/dot.upgrutils @@ -1,3 +1,4 @@ +# $OpenBSD: dot.upgrutils,v 1.3 1996/04/25 21:27:37 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. -# -# $OpenBSD: dot.upgrutils,v 1.2 1996/04/25 02:36:08 mickey Exp $ # Upgrade cleanup utilites (functions), to make sure a recently-upgraded # system is safely runnable. These are meant to be invoked from the shell @@ -48,7 +47,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." } diff --git a/distrib/amiga/floppies/upgr/list b/distrib/amiga/floppies/upgr/list index 1d65a8e146d..28ddfa931ae 100644 --- a/distrib/amiga/floppies/upgr/list +++ b/distrib/amiga/floppies/upgr/list @@ -1,7 +1,7 @@ -# $OpenBSD: list,v 1.4 1996/04/25 02:36:11 mickey Exp $ +# $OpenBSD: list,v 1.5 1996/04/25 21:27:38 niklas Exp $ # copy the kernel -COPY ${CURDIR}/../../../../sys/arch/amiga/compile/INSTALL/netbsd netbsd +COPY ${CURDIR}/../../../../sys/arch/amiga/compile/INSTALL/bsd bsd # and the upgrade tools COPY dot.profile .profile diff --git a/distrib/amiga/floppies/upgr/upgrade.sh b/distrib/amiga/floppies/upgr/upgrade.sh index 6bd7bc18ce3..d4c1517ca68 100644 --- a/distrib/amiga/floppies/upgr/upgrade.sh +++ b/distrib/amiga/floppies/upgr/upgrade.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: upgrade.sh,v 1.3 1996/04/25 21:27:41 niklas Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -27,8 +28,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. -# -# $OpenBSD: upgrade.sh,v 1.2 1996/04/25 02:36:13 mickey Exp $ # OpenBSD upgrade script. # In a perfect world, this would be a nice C program, with a reasonable @@ -89,9 +88,9 @@ Convert_fstab() { sed "s/ufs/ffs/" /mnt/etc/fstab.ufs >/mnt/etc/fstab } -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," @@ -272,11 +271,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!" diff --git a/distrib/atari/inst/dot.instutils b/distrib/atari/inst/dot.instutils index a4d0905ff0d..2e31b012f8e 100644 --- a/distrib/atari/inst/dot.instutils +++ b/distrib/atari/inst/dot.instutils @@ -1,4 +1,4 @@ -# +# $OpenBSD: dot.instutils,v 1.2 1996/04/25 21:27:44 niklas Exp $ # $NetBSD: dot.instutils,v 1.2 1995/05/10 13:41:08 leo Exp $ # # Copyright (c) 1994 Christopher G. Demetriou @@ -28,11 +28,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. -# -# 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() { @@ -147,7 +146,7 @@ Configure() sync echo "" - echo "All that's left to do now is to install the NetBSD kernel on" + echo "All that's left to do now is to install the OpenBSD kernel on" echo "your hard disk. You should now halt your machine using the" echo "'halt' command. Once the machine is halted, replace the" echo "installation floppy with the kernel-copy floppy and hit any" diff --git a/distrib/atari/inst/install.sh b/distrib/atari/inst/install.sh index 51802b8f00a..cee17fa6614 100644 --- a/distrib/atari/inst/install.sh +++ b/distrib/atari/inst/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# +# $OpenBSD: install.sh,v 1.2 1996/04/25 21:27:46 niklas Exp $ # $NetBSD: install.sh,v 1.2 1995/08/25 19:17:28 leo Exp $ # # Copyright (c) 1994 Christopher G. Demetriou @@ -29,9 +29,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. -# -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. @@ -95,9 +94,9 @@ prepdrive() { esac } -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. Its main objective is to format," echo "mount and create an fstab for your root (/) and user (/usr)" echo "partitions." @@ -155,7 +154,7 @@ echo "" echo "THIS IS YOUR LAST CHANCE!!!" echo "" echo "(answering yes will format your root partition on $rdev)" -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 @@ -262,11 +261,11 @@ echo " done." echo "" echo "" echo "OK! The preliminary work of setting up your disk is now complete," -echo "and you can install the actual NetBSD software." +echo "and you can install the actual OpenBSD software." echo "" echo "Right now, your root is mounted on /mnt and your usr on /mnt/usr." echo "You should consult the installation notes to determine how to load" -echo "and install the NetBSD distribution sets, and how to configure your" +echo "and install the OpenBSD distribution sets, and how to configure your" echo "system when you are done." echo "" echo "GOOD LUCK!" diff --git a/distrib/crunch/examples/fixit.conf b/distrib/crunch/examples/fixit.conf index 14c16946381..12a372a2eca 100644 --- a/distrib/crunch/examples/fixit.conf +++ b/distrib/crunch/examples/fixit.conf @@ -1,3 +1,4 @@ +# $OpenBSD: fixit.conf,v 1.2 1996/04/25 21:27:50 niklas Exp $ # fixit.conf - put in anything we think we might want on a fixit floppy # first, we list the source dirs that our programs reside in. These are @@ -38,7 +39,7 @@ ln gzip gzcat # finally, we specify the libraries to link in with our binary -libs -ledit # NetBSDism +libs -ledit # {Net,Open}BSDism libs -lcrypt # but don't include this when exporting :-( libs -lcurses -ltermcap libs -lkvm -ltelnet -lutil -ll diff --git a/distrib/hp300/miniroot/inst/list b/distrib/hp300/miniroot/inst/list index 9f74095fa7e..2d9933af876 100644 --- a/distrib/hp300/miniroot/inst/list +++ b/distrib/hp300/miniroot/inst/list @@ -1,7 +1,8 @@ +# $OpenBSD: list,v 1.4 1996/04/25 21:27:53 niklas Exp $ # $NetBSD: list,v 1.2 1995/11/14 01:40:42 thorpej Exp $ # copy the kernel -COPY ${CURDIR}/../../../../sys/arch/hp300/compile/GENERIC/netbsd netbsd +COPY ${CURDIR}/../../../../sys/arch/hp300/compile/GENERIC/bsd bsd # and the installation tools COPY dot.profile .profile 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!" diff --git a/distrib/mac68k/inst-common/dot.commonutils b/distrib/mac68k/inst-common/dot.commonutils index 64f840321c8..5000223885e 100644 --- a/distrib/mac68k/inst-common/dot.commonutils +++ b/distrib/mac68k/inst-common/dot.commonutils @@ -1,4 +1,4 @@ -# +# $OpenBSD: dot.commonutils,v 1.2 1996/04/25 21:28:42 niklas Exp $ # $NetBSD: dot.commonutils,v 1.1 1995/07/18 04:13:18 briggs Exp $ # # Copyright (c) 1994 Christopher G. Demetriou @@ -28,11 +28,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. -# -# 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. Set_tmp_dir() { diff --git a/distrib/mac68k/inst/dot.instutils b/distrib/mac68k/inst/dot.instutils index 94a55659fe5..5ad7d1ff52e 100644 --- a/distrib/mac68k/inst/dot.instutils +++ b/distrib/mac68k/inst/dot.instutils @@ -1,4 +1,4 @@ -# +# $OpenBSD: dot.instutils,v 1.2 1996/04/25 21:28:35 niklas Exp $ # $NetBSD: dot.instutils,v 1.1 1995/07/18 04:13:08 briggs Exp $ # # Copyright (c) 1994 Christopher G. Demetriou @@ -30,9 +30,9 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# 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/mac68k/inst/install.sh b/distrib/mac68k/inst/install.sh index 1eec1d88717..374038d661f 100644 --- a/distrib/mac68k/inst/install.sh +++ b/distrib/mac68k/inst/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# +# $OpenBSD: install.sh,v 1.2 1996/04/25 21:28:38 niklas Exp $ # $NetBSD: install.sh,v 1.1 1995/07/18 04:13:10 briggs Exp $ # # Copyright (c) 1994 Christopher G. Demetriou @@ -29,9 +29,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. -# -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. @@ -95,9 +94,9 @@ prepdrive() { esac } -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. Its main objective is to format," echo "mount and create an fstab for your root (/) and user (/usr)" echo "partitions." @@ -154,7 +153,7 @@ echo "" echo "THIS IS YOUR LAST CHANCE!!!" echo "" echo "(answering yes will format your root partition on $rdev)" -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 @@ -258,11 +257,11 @@ echo " done." echo "" echo "" echo "OK! The preliminary work of setting up your disk is now complete," -echo "and you can install the actual NetBSD software." +echo "and you can install the actual OpenBSD software." echo "" echo "Right now, your root is mounted on /mnt and your usr on /mnt/usr." echo "You should consult the installation notes to determine how to load" -echo "and install the NetBSD distribution sets, and how to configure your" +echo "and install the OpenBSD distribution sets, and how to configure your" echo "system when you are done." echo "" echo "GOOD LUCK!" diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL index 97cc9880a47..2d126b6e885 100644 --- a/distrib/notes/INSTALL +++ b/distrib/notes/INSTALL @@ -1,37 +1,36 @@ -INSTALLATION NOTES for NetBSD/MACHINE 1.1 +INSTALLATION NOTES for OpenBSD/MACHINE 1.1 Be sure to read _ALL_ of this document before you try to install -NetBSD/MACHINE. +OpenBSD/MACHINE. -What is NetBSD? +What is OpenBSD? ---- -- ------ -NetBSD is a Berkeley Networking Release 2 (Net/2) and 4.4BSD-Lite +OpenBSD is a Berkeley Networking Release 2 (Net/2) and 4.4BSD-Lite -derived Operating System. It is a fully functional UN*X-like system -which runs on many architectures and is being ported to more. NetBSD, -as the name implies, is a creation of the members of the network community -and without the net it's likely that this release wouldn't have come -about. +which runs on many architectures and is being ported to more. OpenBSD, +is a creation of the members of the network community and without the +net it's likely that this release wouldn't have come about. -NetBSD 1.1 is a evolutionary release which contains over a year of +OpenBSD 1.1 is a evolutionary release which contains over a year of changes to the kernel, user-level utilities, and documentation. -Continuing the multi-platform tradition, NetBSD has added ports to +Continuing the multi-platform tradition, OpenBSD has added ports to atari and mvme68k based machines. Kernel interfaces have continued to be refined, and now several subsystems and device drivers are shared among the different ports. You can look for this trend to continue. -NetBSD 1.1 has significantly enhanced the binary emulation subsystem +OpenBSD 1.1 has significantly enhanced the binary emulation subsystem (which includes iBCS2, Linux, OSF/1, SunOS, SVR4, Solaris and Ultrix compatibility) and several kernel subsystems have been generalized to support this more readily. The binary emulation strategy is aimed at making the emulation as accurate as possible. -NetBSD 1.1 is also the first release to see machine-independent disk +OpenBSD 1.1 is also the first release to see machine-independent disk striping. The concatenated disk driver (ccd), which was previously supported only by the hp300 port, has been vastly improved. Many bugs were fixed, and explicit references to device-dependent routines @@ -40,7 +39,7 @@ routines. In addition, several features were added, including partition support, dynamic configuration and unconfiguration via a user space system utility program, and virtually unlimited number of component devices. -Many new user programs have been added in NetBSD 1.1, as well, +Many new user programs have been added in OpenBSD 1.1, as well, bringing it closer to our goal of supplying a complete UN*X-like environment. @@ -48,40 +47,15 @@ environment. #include "whatis" -The Future of NetBSD: +The Future of OpenBSD: --- ------ -- ------ -The NetBSD Foundation was recently incorporated as a non-profit -organization. It's purpose is to encourage, foster and promote the -free exchange of computer software, namely the NetBSD Operating -System. The foundation will allow for many things to be handled more -smoothly than could be done with our previous informal organization. -In particular, it provides the framework to deal with other parties -that wish to become involved in the NetBSD Project. (IN WHAT WAY? Money, donations, etc) - -We believe that the NetBSD Foundation will help improve the quality -of NetBSD by: - - * providing better organization to keep track of development - efforts, including co-ordination with groups working in - related fields. - - * providing a framework to receive donations of goods and - services and to own the resources necessary to run the - NetBSD Project. - - * providing a better position from which to undertake - promotional activities. - - * periodically organizing workshops for developers and other - interested people to discuss ongoing work. - We hope to have regular releases of the full binary and source trees, but these are difficult to coordinate, especially with all of the architectures which we now support! We hope to support even _more_ hardware in the future, and have a rather large number of other ideas -about what can be done to improve NetBSD. We intend to continue our -current practice of making the NetBSD-current development source +about what can be done to improve OpenBSD. We intend to continue our +current practice of making the OpenBSD-current development source available on a daily or nearly-daily basis. We intend to integrate free, positive changes from whatever sources @@ -89,36 +63,36 @@ will provide them, providing that they are well thought-out and increase the usability of the system. Above all, we hope to create a stable and accessible system, and to be -responsive to the needs and desires of NetBSD users, because it is for -and because of them that NetBSD exists. +responsive to the needs and desires of OpenBSD users, because it is for +and because of them that OpenBSD exists. -Sources of NetBSD: +Sources of OpenBSD: ------- -- ------ #include "mirrors" -NetBSD 1.1 Release Contents: +OpenBSD 1.1 Release Contents: ------ --- ------- -------- -The NetBSD 1.1 release is organized in the following way: +The OpenBSD 1.1 release is organized in the following way: -.../NetBSD-1.1/ +.../OpenBSD-1.1/ BUGS Known bugs list (incomplete and out of date). - CHANGES Changes since NetBSD's last + CHANGES Changes since OpenBSD's last release (and before). LAST_MINUTE Last minute changes. MIRRORS A list of sites that mirror - the NetBSD 1.1 distribution. + the OpenBSD 1.1 distribution. README.files README describing the distribution's contents. - TODO NetBSD's todo list (incomplete + TODO OpenBSD's todo list (incomplete and out of date). patches/ Post-release source code @@ -128,7 +102,7 @@ The NetBSD 1.1 release is organized in the following way: below. In addition to the files and directories listed above, there is one -directory per architecture, for each of the architectures that NetBSD +directory per architecture, for each of the architectures that OpenBSD 1.1 has a binary distribution for. There are also 'README.export-control' files sprinkled liberally throughout the distribution tree, which point out that there are some portions of the @@ -152,7 +126,7 @@ are as follows: sets. [ 7.1M gzipped, 30.4M uncompressed ] - ksrc11 This set contains the sources to the NetBSD 1.1 + ksrc11 This set contains the sources to the OpenBSD 1.1 kernel, config(8), config.old(8) and dbsym(8). [ 6.0M gzipped, 27.0M uncompressed ] @@ -162,7 +136,7 @@ are as follows: typesettable document set, the dictionaries, and more. [ 2.4M gzipped, 8.9M uncompressed ] - src11 This set contains all of the NetBSD 1.1 sources which + src11 This set contains all of the OpenBSD 1.1 sources which are not mentioned above. [ 9.3M gzipped, 41.6M uncompressed ] @@ -199,37 +173,37 @@ files is corrupt and have access to a cksum binary. #include "contents" -NetBSD System Requirements and Supported Devices: +OpenBSD System Requirements and Supported Devices: ------ ------ ------------ --- --------- ------- #include "hardware" -Getting the NetBSD System on to Useful Media: +Getting the OpenBSD System on to Useful Media: ------- --- ------ ------ -- -- ------ ----- #include "xfer" -Preparing your System for NetBSD Installation: +Preparing your System for OpenBSD Installation: --------- ---- ------ --- ------ ------------ #include "prep" -Installing the NetBSD System: +Installing the OpenBSD System: ---------- --- ------ ------ #include "install" -Upgrading a previously-installed NetBSD System: +Upgrading a previously-installed OpenBSD System: --------- - ---------- --------- ------ ------ #include "upgrade" -Using online NetBSD documentation +Using online OpenBSD documentation ----- ------ ------ ------------- Documentation is available if you first install the manual @@ -277,28 +251,28 @@ Registration? What's that? If you've got something to say, do so! We'd like your input. There are various mailing lists available via the mailing list -server at <majordomo@NetBSD.ORG>. To get help on using the mailing +server at <majordomo@OpenBSD.ORG>. To get help on using the mailing list server, send mail to that address with an empty body, and it will reply with instructions. There are various mailing lists set up to deal with comments and questions about this release. Please send comments to: - netbsd-comments@NetBSD.ORG + openbsd-comments@OpenBSD.ORG -To report bugs, use the 'send-pr' command shipped with NetBSD, +To report bugs, use the 'send-pr' command shipped with OpenBSD, and fill in as much information about the problem as you can. Good bug reports include lots of details. Additionally, bug reports can be sent by mail to: - netbsd-bugs@NetBSD.ORG + openbsd-bugs@NetBSD.ORG Use of 'send-pr' is encouraged, however, because bugs reported with it -are entered into the NetBSD bugs database, and thus can't slip through +are entered into the OpenBSD bugs database, and thus can't slip through the cracks. There are also port-specific mailing lists, to discuss aspects of -each port of NetBSD. Use majordomo to find their addresses. If +each port of OpenBSD. Use majordomo to find their addresses. If you're interested in doing a serious amount of work on a specific port, you probably should contact the "owner" of that port (listed below). @@ -306,7 +280,7 @@ below). If you'd like to help with this effort, and have an idea as to how you could be useful, send mail and/or subscribe to: - netbsd-help@NetBSD.ORG + openbsd-help@OpenBSD.ORG As a favor, please avoid mailing huge documents or files to these mailing lists. Instead, put the material you would have sent up @@ -334,25 +308,16 @@ Also, our thanks go to: for answering lots of questions, fixing bugs, and doing the various work they've done. -UC Berkeley's Experimental Computing Facility provided a home for -sun-lamp in the past, people to look after it, and a sense of humor. -Rob Robertson, too, has added his unique sense of humor to things, and -for a long time provided the primary FTP site for NetBSD. - Without CVS, this project would be impossible to manage, so our hats go off to Brian Berliner, Jeff Polk, and the various other people who've had a hand in making CVS a useful tool. -Alistair G. Crooks <agc@westley.demon.co.uk> has been producing tar -file snapshot reports for NetBSD-current users, a very valuable -service. - Dave Burgess <burgess@cynjut.infonet.net> has been maintaining the 386BSD/NetBSD/FreeBSD FAQ for quite some time, and deserves to be recognized for it. The following people (in alphabetical order) have made donations or -loans of hardware and/or money, to support NetBSD development, and +loans of hardware and/or money, to support OpenBSD development, and deserve credit for it: #include "donations" (If you're not on that list and should be, tell us! We probably were @@ -360,7 +325,7 @@ not able to get in touch with you, to verify that you wanted to be listed.) Finally, we thank all of the people who've put sweat and tears into -developing NetBSD since its inception in January, 1993. (Obviously, +developing OpenBSD since its inception in October (?), 1995. (Obviously, there are a lot more people who deserve thanks here. If you're one of them, and would like to mentioned, tell us!) @@ -369,50 +334,6 @@ We are: -- --- (in alphabetical order) -The NetBSD core group: -J.T. Conklin <jtc@NetBSD.ORG> -Charles Hannum <mycroft@NetBSD.ORG> -Paul Kranenburg <pk@NetBSD.ORG> -Jason Thorpe <thorpej@NetBSD.ORG> -Christos Zoulas <christos@NetBSD.ORG> - -The port-masters (and their ports): -Allen Briggs <briggs@mail.vt.edu> (mac68k) -Chuck Cranor <chuck@NetBSD.ORG> (mvme68k) -Chris G. Demetriou <cgd@NetBSD.ORG> (alpha) -Charles Hannum <mycroft@NetBSD.ORG> (i386) -Chris Hopps <chopps@NetBSD.ORG> (amiga) -Paul Kranenburg <pk@NetBSD.ORG> (sparc) -Ted Lemon <mellon@NetBSD.ORG> (pmax) -Anders Magnusson <ragge@NetBSD.ORG> (vax) -Phil Nelson <phil@NetBSD.ORG> (pc532) -Gordon Ross <gwr@NetBSD.ORG> (sun3) -Jason Thorpe <thorpej@NetBSD.ORG> (hp300) -Leo Weppelman <leo@NetBSD.ORG> (atari) - -Supporting cast: -Steve Allen <wormey@eskimo.com> -John Brezak <brezak@NetBSD.ORG> -Dave Burgess <burgess@cynjut.infonet.net> -Hubert Feyrer <hubert.feyrer@rz.uni-regensburg.de> -Adam Glass <glass@NetBSD.ORG> -Brad Grantham <grantham@tenon.com> -Matthew Green <mrg@eterna.com.au> -Michael L. Hitch <osymh@gemini.oscs.montana.edu> -Lawrence Kesteloot <kesteloo@cs.unc.edu> -John Kohl <jtk@NetBSD.ORG> -Paul Mackerras <paulus@NetBSD.ORG> -Neil J. McRae <neil@domino.org> -Perry Metzger <perry@NetBSD.ORG> -Herb Peyerl <hpeyerl@beer.org> -Matthias Pfaller <leo@marco.de> -Chris Provenzano <proven@NetBSD.ORG> -Waldi Ravens <waldi@moacs.indiv.nl.net> -Scott Reynolds <scottr@edsi.org> -Thor Lancelot Simon <tls@NetBSD.ORG> -Wolfgang Solfrank <ws@tools.de> -Frank van der Linden <fvdl@NetBSD.ORG> - Legal Mumbo-jumbo: ----- ----- ----- diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents index b913bb10f13..4be4880376f 100644 --- a/distrib/notes/amiga/contents +++ b/distrib/notes/amiga/contents @@ -1,8 +1,8 @@ -The amiga-specific portion of the NetBSD 1.1 release is found in the +The amiga-specific portion of the OpenBSD 1.1 release is found in the "amiga" subdirectory of the distribution. That subdirectory is layed out as follows: -.../NetBSD-1.1/amiga/ +.../OpenBSD-1.1/amiga/ binary/ amiga binary distribution sets; see below. @@ -17,7 +17,7 @@ out as follows: installation section, below. There are two amiga file system images to be found in the "amiga/miniroot" -subdirectory of the NetBSD 1.1 distribution. One of them is a upgrade +subdirectory of the OpenBSD 1.1 distribution. One of them is a upgrade image and one is an installation image. They are described in more detail below. There are gzipped versions of each available, for easier downloading. (The gzipped version have the ".gz" extension added to @@ -26,7 +26,7 @@ their names.) Installation file system: This file contains a BSD root file system setup to help - you install the rest of NetBSD. This includes formatting + you install the rest of OpenBSD. This includes formatting and mounting your root and /usr partitions and getting ready to extract (and possibly first fetching) the distribution sets. There is enough on this file system to allow you to @@ -40,7 +40,7 @@ Installation file system: Upgrade file system: This file contains a BSD root file system setup to help - you upgrade a previous version of NetBSD. This includes + you upgrade a previous version of OpenBSD. This includes converting existing partitions and mounting your root and /usr partitions and getting ready to extract (and possibly first fetching) the distribution sets. There is enough on @@ -48,25 +48,25 @@ Upgrade file system: configure an ethernet, mount an NFS file system or ftp. You can also load distribution sets from a SCSI tape, from one of your existing AmigaDOS partitions, or from an existing - NetBSD partition. + OpenBSD partition. This file is named "upgr-11.fs". -The NetBSD/amiga binary distribution sets contain the binaries which -comprise the NetBSD 1.1 release for the amiga. There are seven binary +The OpenBSD/amiga binary distribution sets contain the binaries which +comprise the OpenBSD 1.1 release for the amiga. There are seven binary distribution sets, and the "security" distribution set. The binary distribution sets can be found in subdirectories of the "amiga/binary" -subdirectory of the NetBSD 1.1 distribution tree, and are as follows: +subdirectory of the OpenBSD 1.1 distribution tree, and are as follows: - base11 The NetBSD/amiga 1.1 base binary distribution. You + base11 The OpenBSD/amiga 1.1 base binary distribution. You MUST install this distribution set. It contains the - base NetBSD utilities that are necessary for the + base OpenBSD utilities that are necessary for the system to run and be minimally functional. It includes shared library support, and excludes everything described below. [ 7M gzipped, 20M uncompressed ] - comp11 The NetBSD/amiga Compiler tools. All of the tools + comp11 The OpenBSD/amiga Compiler tools. All of the tools relating to C, C++, and FORTRAN (yes, there are two!). This set includes the system include files (/usr/include), the linker, the compiler tool chain, @@ -101,16 +101,16 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows: installed from the source tree by default. [ 2M gzipped, 7M uncompressed ] - text11 This set includes NetBSD's text processing tools, + text11 This set includes OpenBSD's text processing tools, including groff, all related programs, and their manual pages. [ 784K gzipped, 3M uncompressed ] The amiga security distribution set is named "secr11" and can be found -in the "amiga/security" subdirectory of the NetBSD 1.1 distribution +in the "amiga/security" subdirectory of the OpenBSD 1.1 distribution tree. It contains crypt.c (the source file for the DES encryption algorithm) and the binaries which depend on it. It can only be found -on those sites which carry the complete NetBSD distribution and that +on those sites which carry the complete OpenBSD distribution and that can legally obtain it. (Remember, because of United States law, this distribution set may not be exported to locations outside of the United States and Canada.) [ 128K gzipped, 307K uncompressed ] diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install index 19c6112d6df..d6480ab6918 100644 --- a/distrib/notes/amiga/install +++ b/distrib/notes/amiga/install @@ -1,4 +1,4 @@ -Installing NetBSD is a relatively complex process, but, if you have +Installing OpenBSD is a relatively complex process, but, if you have this document in hand and are careful to read and remember the information which is presented to you by the install program, it shouldn't be too much trouble. @@ -6,14 +6,14 @@ shouldn't be too much trouble. Before you begin, you must have already prepared your hard disk as detailed in the section on preparing your system for install. -The following is a walk-through of the steps necessary to get NetBSD +The following is a walk-through of the steps necessary to get OpenBSD installed on your hard disk. If you wish to stop the installation, you may hit Control-C at any prompt, but if you do, you'll have to begin again from scratch. Transfer the install miniroot filesystem onto the hard disk - partition used by NetBSD for swapping, as described in the - "Preparing your System for NetBSD Installation" section above. + partition used by OpenBSD for swapping, as described in the + "Preparing your System for OpenBSD Installation" section above. You then need to have "ixemul.library" in your LIBS: directory on AmigaDOS. You also need to have the "loadbsd" program @@ -22,10 +22,10 @@ begin again from scratch. protection bit is set. If not, set it with the command: Protect loadbsd add e - Next you need to get yourself into NetBSD by loading the + Next you need to get yourself into OpenBSD by loading the kernel from AmigaDOS with loadbsd like so: - loadbsd -b netbsd + loadbsd -b bsd If you have an AGA machine, and your monitor will handle the dblNTSC mode, you may also include the "-A" option to @@ -41,7 +41,7 @@ begin again from scratch. If the system should hang after entering the root device, try again with - loadbsd -I ff -b netbsd + loadbsd -I ff -b bsd This disables synchronous transfer on all SCSI devices. @@ -59,10 +59,10 @@ begin again from scratch. you want to use for your root. If you have multiple disks present with root partitions defined, you will need to be sure you enter the device name of the correct partition you - want to install NetBSD on. + want to install OpenBSD on. YOU ARE NOW AT THE POINT OF NO RETURN. If you confirm that - you want to install NetBSD, your hard drive will be modified, + you want to install OpenBSD, your hard drive will be modified, and perhaps its contents scrambled at the whim of the install program. @@ -98,7 +98,7 @@ begin again from scratch. two file systems. This fstab will be in /mnt/etc. What you do from this point on depends on which media you're - using to install NetBSD. Follow the appropriate instructions, + using to install OpenBSD. Follow the appropriate instructions, given below. To install from an AmigaDOS partition: @@ -290,16 +290,16 @@ network configuration information. Once you have supplied `Configure' all that it requests, your machine will be configured well enough that when you reboot it it will -almost be a completely functional NetBSD system. +almost be a completely functional OpenBSD system. >>> Copy the kernel from the miniroot filesystem at this point <<< Once you are done with `Configure', halt the system with the "halt" command (wait for "halted" to be displayed) and reboot. Then again -boot NetBSD this time with the command: +boot OpenBSD this time with the command: - loadbsd netbsd + loadbsd bsd You need to do your final tweeks now. First mount your file systems like so: @@ -313,14 +313,14 @@ These things can be found in /etc/netstart. Use vi, if you installed the man pages you can type `man vi' or `man ed' for instructions on how to use these somewhat non-intuitive editors. -You should also put a copy of the netbsd kernel in your root partition. +You should also put a copy of the bsd kernel in your root partition. This can be done easily by mounting the AmigaDOS partition containing -the kernel you used to start NetBSD and copying the "netbsd" file to +the kernel you used to start OpenBSD and copying the "netbsd" file to the root: mount -r -t ados /dev/sd0d /mnt - cp /mnt/netbsd / -(where /dev/sd0d is the AmigaDOS partition where you have netbsd, and -/mnt/netbsd is the appropriate path of the netbsd file). + cp /mnt/bsd / +(where /dev/sd0d is the AmigaDOS partition where you have bsd, and +/mnt/bsd is the appropriate path of the bsd file). Once you are done with the rest of configuration unmount your file systems and halt your system, then reboot: @@ -333,7 +333,7 @@ systems and halt your system, then reboot: Finally you can now boot your system and it will be completely functional: - loadbsd -a netbsd + loadbsd -a bsd When it boots off of the hard drive, you will have a complete -NetBSD system! CONGRATULATIONS! (You really deserve them!!!) +OpenBSD system! CONGRATULATIONS! (You really deserve them!!!) diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep index b92b6879779..7a1292950ba 100644 --- a/distrib/notes/amiga/prep +++ b/distrib/notes/amiga/prep @@ -1,5 +1,5 @@ You will need an AmigaDOS hard drive prep tool to prepare you hard -drives for use with NetBSD/amiga. HDToolBox is provided with the +drives for use with OpenBSD/amiga. HDToolBox is provided with the system software and on floppy installation disks since Release 2.0 of AmigaDOS so we will provide instructions for its use. @@ -39,10 +39,10 @@ Preparing you hard disk with HDToolBox: The important things you need to do above and beyond normal partitioning includes (from Partition Drive section): - Marking all NetBSD partitions as non-bootable. + Marking all OpenBSD partitions as non-bootable. Changing the file system parameters of the partitions - to NetBSD ones. This must be done from the + to OpenBSD ones. This must be done from the partitioning section and `Advanced options' must be enabled. To Make the needed changes: @@ -58,7 +58,7 @@ Preparing you hard disk with HDToolBox: other partitions: 0x4e425507 Here `other' refers to other partitions you will - format for reading and writing under NetBSD (e.g. + format for reading and writing under OpenBSD (e.g. /usr) Make sure you hit the return key to enter this value @@ -69,27 +69,27 @@ Preparing you hard disk with HDToolBox: - Set Reserved Blocks start and end to 0. - Click Ok. - Mask and maxtransfer are not used with NetBSD. + Mask and maxtransfer are not used with OpenBSD. Until you compile your own kernel your swap partition must exist on the drive that also holds your root partition. - Once this is done NetBSD/amiga will be able to recognize your + Once this is done OpenBSD/amiga will be able to recognize your disks and which partitions it should use. Transferring the miniroot filesystem: - The NetBSD/amiga installation or upgrade now uses a "miniroot" - fileystem which is installed on the partition used by NetBSD + The OpenBSD/amiga installation or upgrade now uses a "miniroot" + fileystem which is installed on the partition used by OpenBSD for swapping. This removes the requirement of using a floppy disk for the filesystem used by the installation or upgrade process. It also allows more utilities to be present on the filesystem than would be available when using an 880K floppy disk. - Once the hard disk has been prepared for NetBSD, the appropriate + Once the hard disk has been prepared for OpenBSD, the appropriate miniroot filesystem (inst-11.fs for a new install or upgr-11.fs for an upgrade) is transferred to the swap partition configured during the hard disk prep (or the existing swap parition in @@ -97,23 +97,23 @@ Transferring the miniroot filesystem: the "amiga/utilities" directory can be used on AmigaDOS to transfer the filesystem for either a new installation or an upgrade. The filesystem can also be transferred on an existing - NetBSD system for an update by using dd. This should only be - done after booting NetBSD into single-user state. It may also + OpenBSD system for an update by using dd. This should only be + done after booting OpenBSD into single-user state. It may also be possible to shutdown to single-user, providing that the single-user state processes are not using the swap partition. On AmigaDOS, the command: xstreamtodev --input=inst-11.fs --rdb-name=<swap partition> - where <swap partition> is the name you gave to the NetBSD + where <swap partition> is the name you gave to the OpenBSD partition to be used for swapping. Use upgr-11.fs if you - are going to do an upgrade of an existing NetBSD system. If + are going to do an upgrade of an existing OpenBSD system. If xstreamtodev is unable to determine the SCSI driver device name or the unit number of the specified partition, you may also need to include the option "--device=<driver.name>" and/or "--unit=<SCSI unit number>". - To transfer the miniroot using NetBSD, you should be booted up - in single user state on the current NetBSD system, or use the + To transfer the miniroot using OpenBSD, you should be booted up + in single user state on the current OpenBSD system, or use the "shutdown now" command to shutdown to single-uyser state. Then copy the miniroot using dd: dd if=upgr-11.fs of=/dev/rsd0b diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade index e4afcfaff8b..f5ff2f5301e 100644 --- a/distrib/notes/amiga/upgrade +++ b/distrib/notes/amiga/upgrade @@ -1,4 +1,4 @@ -The upgrade to NetBSD 1.1 is a binary upgrade; it would be prohibitive +The upgrade to OpenBSD 1.1 is a binary upgrade; it would be prohibitive to make users upgrade by compiling and installing the 1.1 sources, and it would be very difficult to even compile a set of instructions that allowed them to do so. Because of the various changes to the system, @@ -6,9 +6,9 @@ the largest being the 64-bit file size support and shared libraries, it is impractical to upgrade by recompiling from the sources and installing. -To do the upgrade, you must have the NetBSD kernel on AmigaDOS and +To do the upgrade, you must have the OpenBSD kernel on AmigaDOS and you must transfer the upgrade filesystem upgr-11.fs onto the swap -partition of the NetBSD hard disk. You must also have at least the +partition of the OpenBSD hard disk. You must also have at least the "base11" binary distribution set available, so that you can upgrade with it, using one of the upgrade methods described above. Finally, you must have sufficient disk space available to install the new @@ -20,25 +20,25 @@ root and /usr partitions, you should have enough space. Since upgrading involves replacing the kernel, and most of the system binaries, it has the potential to cause data loss. You are strongly advised to BACK UP ANY IMPORTANT DATA ON YOUR DISK, whether on the -NetBSD partition or on another operating system's partition, before +OpenBSD partition or on another operating system's partition, before beginning the upgrade process. To upgrade your system, follow the following instructions: Transfer the upgrade miniroot filesystem onto the hard disk - partition used by NetBSD for swapping, as described in the - "Preparing your System for NetBSD Installation" section above. + partition used by OpenBSD for swapping, as described in the + "Preparing your System for OpenBSD Installation" section above. - Now boot up NetBSD using the 1.1 kernel using the loadbsd + Now boot up OpenBSD using the 1.1 kernel using the loadbsd command: - loadbsd -b netbsd + loadbsd -b bsd You should see the screen clear and some information about your system as the kernel configures the hardware. Note which hard disk device is configured that contains your root and swap partition. When prompted for the root device, type - 'sd0*' (replacing 0 with the disk number that NetBSD used for + 'sd0*' (replacing 0 with the disk number that OpenBSD used for your root/swap device). The '*' character indicates that the root filesystem is contained on the swap partition. When you reach the prompt asking you for a shell name, just @@ -73,12 +73,12 @@ To upgrade your system, follow the following instructions: under /mnt. (In other words, your root partition will be mounted on /mnt, your /usr partition on /mnt/usr, etc.) - If you don't already have the NetBSD distribution sets on your + If you don't already have the OpenBSD distribution sets on your disk, look in the installation section for information on how to transfer them to your disk. Once the distribution sets are transferred to your disk, - continue here. (Obviously, if the NetBSD distribution sets + continue here. (Obviously, if the OpenBSD distribution sets are already on your disk, because you've transferred them before starting the upgrade process, you don't need to transfer them again now!) @@ -110,13 +110,13 @@ To upgrade your system, follow the following instructions: up the installation, by remaking some system databases. When it is complete, you should use "halt" to halt the system. - You will probably also want to copy the release "netbsd" kernel + You will probably also want to copy the release "bsd" kernel image to your root at some point. -Your system has now been upgraded to NetBSD 1.1. +Your system has now been upgraded to OpenBSD 1.1. After a new kernel has been copied to your hard disk, your - machine is a complete NetBSD 1.1 system. However, that + machine is a complete OpenBSD 1.1 system. However, that doesn't mean that you're finished with the upgrade process. There are several things that you should do, or might have to do, to insure that the system works properly. @@ -150,8 +150,8 @@ After a new kernel has been copied to your hard disk, your page.) Finally, you will want to delete old binaries that were part - of the version of NetBSD that you upgraded from and have since - been removed from the NetBSD distribution. You might also + of the version of OpenBSD that you upgraded from and have since + been removed from the OpenBSD distribution. You might also want to recompile any locally-built binaries, to take advantage of the shared libraries. (Note that any new binaries that you build will be dynamically linked, and diff --git a/distrib/notes/amiga/whatis b/distrib/notes/amiga/whatis index 6633cbe79b0..6175e2d33f9 100644 --- a/distrib/notes/amiga/whatis +++ b/distrib/notes/amiga/whatis @@ -1,5 +1,3 @@ -This is the second public release of NetBSD for the Amiga line of -computers. Several additional graphics and network boards are now -supported. Some of the SCSI drivers have been enhanced and (hopefully) -improved. +This is the first public release of OpenBSD for the Amiga line of +computers. Several graphics, SCSI and network boards are supported. diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer index de0edd3f1c1..0d1eca8c60a 100644 --- a/distrib/notes/amiga/xfer +++ b/distrib/notes/amiga/xfer @@ -3,12 +3,12 @@ Installation is supported from several media types, including: Tape NFS partitions FTP - NetBSD partitions, if doing an upgrade. + OpenBSD partitions, if doing an upgrade. The install or upgrade miniroot filesystem needs to be transferred -to the NetBSD swap partition. This can be done from AmigaDOS in -the case of a new install or upgrade, or from NetBSD when doing an -upgrade. See the "Preparing your System for NetBSD Installation" +to the OpenBSD swap partition. This can be done from AmigaDOS in +the case of a new install or upgrade, or from OpenBSD when doing an +upgrade. See the "Preparing your System for OpenBSD Installation" section for details. The steps necessary to prepare the distribution sets @@ -17,8 +17,8 @@ you choose. The various methods are explained below. To prepare for installing via an AmigaDOS partition: - To install NetBSD from an AmigaDOS partition, you need to - get the NetBSD distribution sets you wish to install + To install OpenBSD from an AmigaDOS partition, you need to + get the OpenBSD distribution sets you wish to install on your system on to an AmigaDOS partition. All of the set_name.xx pieces can be placed in a single directory instead of separate ones for each distribution set. This @@ -31,8 +31,8 @@ To prepare for installing via an AmigaDOS partition: To prepare for installing via a tape: - To install NetBSD from a tape, you need to somehow - get the NetBSD filesets you wish to install on + To install OpenBSD from a tape, you need to somehow + get the OpenBSD filesets you wish to install on your system on to the appropriate kind of tape, in tar format. @@ -60,16 +60,16 @@ To prepare for installing via an NFS partition: should help, but is not intended to be all-encompassing. - Place the NetBSD software you wish to install into + Place the OpenBSD software you wish to install into a directory on an NFS server, and make that directory mountable by the machine which you will be installing - NetBSD on. This will probably require modifying the + OpenBSD on. This will probably require modifying the /etc/exports file of the NFS server and resetting mountd, acts which will require superuser privileges. Note the numeric IP address of the NFS server and of - the router closest to the the new NetBSD machine, + the router closest to the the new OpenBSD machine, if the NFS server is not on a network which is - directly attached to the NetBSD machine. + directly attached to the OpenBSD machine. Once you have done this, you can proceed to the next step in the installation process, preparing your hard disk. @@ -86,7 +86,7 @@ To prepare for installing via FTP: The preparations for this method of installation are easy: all you have to do is make sure that there's some FTP site from which you can retrieve - the NetBSD installation when it's time to do + the OpenBSD installation when it's time to do the install. You should know the numeric IP address of that site, the numeric IP address of your nearest router if one is necessary @@ -94,8 +94,8 @@ To prepare for installing via FTP: Once you have done this, you can proceed to the next step in the installation process, preparing your hard disk. -If you are upgrading NetBSD, you also have the option of installing -NetBSD by putting the new distribution sets somewhere in your existing +If you are upgrading OpenBSD, you also have the option of installing +OpenBSD by putting the new distribution sets somewhere in your existing file system, and using them from there. To do that, you must do the following: diff --git a/distrib/notes/atari/contents b/distrib/notes/atari/contents index 4746977bd42..cf0722693ea 100644 --- a/distrib/notes/atari/contents +++ b/distrib/notes/atari/contents @@ -1,8 +1,8 @@ -The Atari-specific portion of the NetBSD 1.1 release is found in the +The Atari-specific portion of the OpenBSD 1.1 release is found in the "atari" subdirectory of the distribution. That subdirectory is layed out as follows: -.../NetBSD-1.1/atari/ +.../OpenBSD-1.1/atari/ binary/ atari binary distribution sets; see below. @@ -12,13 +12,13 @@ out as follows: security/ atari security distribution; see below; - utils.netbsd/ + utils.openbsd/ utils.tos/ Miscellaneous atari installation utilities; see installation section, below. There are three atari floppy images to be found in the "atari/floppies" -subdirectory of the NetBSD 1.1 distribution. One of them is a +subdirectory of the OpenBSD 1.1 distribution. One of them is a bootable TOS kernel floppy and the other two are installation floppy's. They are described in more detail below. There are gzipped versions of each available, for easier downloading. (The gzipped version @@ -35,7 +35,7 @@ Bootable Kernel floppy: Installation floppy: This disk contains a BSD root file system setup to help - you install the rest of NetBSD. This includes formatting + you install the rest of OpenBSD. This includes formatting and mounting your root and /usr partitions and getting ready to extract (and possibly first fetching) the distribution sets. There is enough on this file system to allow you to @@ -45,21 +45,21 @@ Installation floppy: This floppy's are named "inst-11.fs.1" and "inst-11.fs.2". -The NetBSD/atari binary distribution sets contain the binaries which -comprise the NetBSD 1.1 release for the atari. There are seven binary +The OpenBSD/atari binary distribution sets contain the binaries which +comprise the OpenBSD 1.1 release for the atari. There are seven binary distribution sets, and the "security" distribution set. The binary distribution sets can be found in subdirectories of the "atari/binary" -subdirectory of the NetBSD 1.1 distribution tree, and are as follows: +subdirectory of the OpenBSD 1.1 distribution tree, and are as follows: - base11 The NetBSD/atari 1.1 base binary distribution. You + base11 The OpenBSD/atari 1.1 base binary distribution. You MUST install this distribution set. It contains the - base NetBSD utilities that are necessary for the + base OpenBSD utilities that are necessary for the system to run and be minimally functional. It includes shared library support, and excludes everything described below. [ 7M gzipped, 19M uncompressed ] - comp11 The NetBSD/atari Compiler tools. All of the tools + comp11 The OpenBSD/atari Compiler tools. All of the tools relating to C, C++, and FORTRAN (yes, there are two!). This set includes the system include files (/usr/include), the linker, the compiler tool chain, @@ -94,16 +94,16 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows: installed from the source tree by default. [ 2M gzipped, 6M uncompressed ] - text11 This set includes NetBSD's text processing tools, + text11 This set includes OpenBSD's text processing tools, including groff, all related programs, and their manual pages. [ 784K gzipped, 3M uncompressed ] The atari security distribution set is named "secr11" and can be found -in the "atari/security" subdirectory of the NetBSD 1.1 distribution +in the "atari/security" subdirectory of the OpenBSD 1.1 distribution tree. It contains crypt.c (the source file for the DES encryption algorithm) and the binaries which depend on it. It can only be found -on those sites which carry the complete NetBSD distribution and that +on those sites which carry the complete OpenBSD distribution and that can legally obtain it. (Remember, because of United States law, this distribution set may not be exported to locations outside of the United States and Canada.) [ 119K gzipped, 300K uncompressed ] diff --git a/distrib/notes/atari/hardware b/distrib/notes/atari/hardware index cf708802f19..9cbb97a6abc 100644 --- a/distrib/notes/atari/hardware +++ b/distrib/notes/atari/hardware @@ -1,4 +1,4 @@ -NetBSD/atari 1.1 runs on a TT030 and a Falcon. Currently an FPU is +OpenBSD/atari 1.1 runs on a TT030 and a Falcon. Currently an FPU is required, although this might change in the (near) future. The minimum amount of RAM required is 4Mb. diff --git a/distrib/notes/atari/install b/distrib/notes/atari/install index 727d519f7ee..6169d7db186 100644 --- a/distrib/notes/atari/install +++ b/distrib/notes/atari/install @@ -1,4 +1,4 @@ -Installing NetBSD is a relatively complex process, but, if you have +Installing OpenBSD is a relatively complex process, but, if you have this document in hand and are careful to read and remember the information which is presented to you by the install program, it shouldn't be too much trouble. @@ -6,21 +6,21 @@ shouldn't be too much trouble. Before you begin, you must have already prepared your hard disk as detailed in the section on preparing your system for install. -The following is a walk-through of the steps necessary to get NetBSD +The following is a walk-through of the steps necessary to get OpenBSD installed on your hard disk. If you wish to stop the installation, you may hit Control-C at any prompt, but if you do, you'll have to begin again from scratch. - First you need to get yourself into NetBSD. This can be + First you need to get yourself into OpenBSD. This can be done in a couple ways, both of which currently require GEMDOS. You can insert the GEMDOS kernel floppy and select the loadbsd program. It will ask for parameters, - supply: '-b netbsd'. You can, of course, also run it + supply: '-b bsd'. You can, of course, also run it from the shell command-line in MiNT: - loadbsd -b a:/netbsd + loadbsd -b a:/bsd You should see the screen clear and some information about your system as the kernel configures the hardware. Then @@ -48,7 +48,7 @@ begin again from scratch. use as your root. YOU ARE NOW AT THE POINT OF NO RETURN. If you confirm that - you want to install NetBSD, your hard drive will be modified, + you want to install OpenBSD, your hard drive will be modified, and perhaps its contents scrambled at the whim of the install program. @@ -73,7 +73,7 @@ begin again from scratch. list of the partitions on that disk along with their sizes, types, etc.. Choose the letter that corresponds to the partition you wish to use for /usr. To be able to make the - proper selection, you need to know, that NetBSD assigns a + proper selection, you need to know, that OpenBSD assigns a special meaning to some of the partition letters: 'a' : root filesystem 'b' : swap partition @@ -90,7 +90,7 @@ begin again from scratch. two file systems. This fstab will be in /mnt/etc. What you do from this point on depends on which media you're - using to install NetBSD. Follow the appropriate instructions, + using to install OpenBSD. Follow the appropriate instructions, given below. To install from an GEMDOS partition: @@ -216,14 +216,14 @@ network configuration information. Once you have supplied `Configure' all that it requests, your machine will be configured well enough that when you reboot it it will -almost be a completely functional NetBSD system. Note you should +almost be a completely functional OpenBSD system. Note you should ignore the errors from `chown' they will be corrected shortly. Once you are done with `Configure', halt the system with the "halt" command (wait for "halted" to be displayed) and reboot. Then again -boot NetBSD this time with the command: +boot OpenBSD this time with the command: - loadbsd netbsd + loadbsd bsd You need to do your final tweeks now. First mount your file systems like so: @@ -243,17 +243,17 @@ the man pages you can type `man vi' or `man ed' for instructions on how to use these somewhat non-intuitive editors. As mentioned at the end of the `Configure' run, you should copy the -NetBSD kernel onto the root partition as "/netbsd". There is also -another option to this. As NetBSD/Atari has to be booted from TOS, +OpenBSD kernel onto the root partition as "/bsd". There is also +another option to this. As OpenBSD/Atari has to be booted from TOS, you could do the following: Reserve a small GEMDOS partition of about 4Mb. This is - enough to put in a few kernels. Put the netbsd kernel + enough to put in a few kernels. Put the bsd kernel into this partition. Also, edit your /etc/fstab to always mount this partition, say as /kernels. Now make a symlink - from /netbsd to /kernels/netbsd. + from /bsd to /kernels/bsd. This sceme is particulary handy when you want to make your own kernel. When compilation is finished, you just copy - your kernel to /kernels/netbsd and reboot. It's wise to + your kernel to /kernels/bsd and reboot. It's wise to make sure there is _always_ a 'know to work' kernel image present. @@ -272,7 +272,7 @@ systems and halt your system, then reboot: Finally you can now boot your system and it will be completely functional: - loadbsd -a netbsd + loadbsd -a bsd When it boots off of the hard drive, you will have a complete -NetBSD system! CONGRATULATIONS! (You really deserve them!!!) +OpenBSD system! CONGRATULATIONS! (You really deserve them!!!) diff --git a/distrib/notes/atari/prep b/distrib/notes/atari/prep index dd68c6ce618..2aa186071ad 100644 --- a/distrib/notes/atari/prep +++ b/distrib/notes/atari/prep @@ -15,8 +15,8 @@ The partitioning can be done in two ways, the first method heavily relies on the AHDI way of partitioning, the second method nearly ignores the AHDI partitioning and gives you far more flexibility. Currently, the second method can only be achieved from a working -NetBSD/atari system. How this should be done is described in -"upgrading to NetBSD-labeling". +OpenBSD/atari system. How this should be done is described in +"upgrading to OpenBSD-labeling". Using AHDI partitioning: The paritioning can be done with the AHDI-disk that is @@ -27,18 +27,18 @@ Using AHDI partitioning: You will need the 'chg_part' program from the bootdisk to prepare your harddisk a bit more. This program will change the - partition-id so NetBSD knows which partitions it can use. The + partition-id so OpenBSD knows which partitions it can use. The synopsis is: chg_part <driveno> <partno> <new_id> The drive number corresponds with the drive's SCSI-id. The new id can be selected from one of the following acronyms: - NBU - NetBSD User partition - NBR - NetBSD Root partition - NBS - NetBSD Swap partition - Because NetBSD cannot be bootloaded (yet) and thus must be + NBU - OpenBSD User partition + NBR - OpenBSD Root partition + NBS - OpenBSD Swap partition + Because OpenBSD cannot be bootloaded (yet) and thus must be loaded through GEM, it is unwise to use drive 'C' - (drive 0/partition 1) as a NetBSD partition. When a partition-id + (drive 0/partition 1) as a OpenBSD partition. When a partition-id is changed, GEMDOS won't be able to recognize your drive, so be warned that the drive labels are shifted afterwards. The chg_part program still recognizes them, take this into account when @@ -47,17 +47,17 @@ Using AHDI partitioning: chg_part again with the same drive/partition arguments but supplied the original partition id. -Upgrading to NetBSD-labeling: +Upgrading to OpenBSD-labeling: First of all the new disk label functions are fully backwards compatible with the current (old) behaviour, therefore you don't have to rename partition identifiers if you don't want to. The only limitation is that you won't be able to write a disklabel to your harddisk ("Device not configured."). - If you'ld like to have the flexibility of the NetBSD disk label, + If you'ld like to have the flexibility of the OpenBSD disk label, the procedure is very simple: change the identifier of the AHDI - partition that contains your NetBSD root filesystem from NBR to NBD. - Boot NetBSD; run `disklabel -e sd?'; disklabel will start vi; + partition that contains your OpenBSD root filesystem from NBR to NBD. + Boot OpenBSD; run `disklabel -e sd?'; disklabel will start vi; quit vi without changing anything; now the disklabel should be written to the NBD partition. If at this point disklabel tells you that one or more of your partitions extend past the end of @@ -66,7 +66,7 @@ Upgrading to NetBSD-labeling: If you like, you can now change the NBD partition id to RAW (this would for example be necessary if the partition must be shared with MiNT), but keep in mind that the partition id must - be either NBD or RAW, otherwise NetBSD won't be able to find the + be either NBD or RAW, otherwise OpenBSD won't be able to find the disklabel. The NBS id (used for a swap partition) is no longer needed, you can change it to whatever you like (or leave it as is, if that's what you like :-) ). The same is true for the @@ -74,24 +74,24 @@ Upgrading to NetBSD-labeling: WARNINGS: - the NBD partition does not necessarily have to be the - partition that contains the NetBSD root filesystem, but + partition that contains the OpenBSD root filesystem, but it *must* be a partition that contains a fast filesystem. Do *not* try this with a partition that contains a gemdos, minix or ext2 filesystem; if you do, you'll *loose* a filesystem. - Now that you have a real disklabel, you can modify it in (almost) any way you want. However, if you make a mess of - the disk label, NetBSD may (or may not) make a mess of + the disk label, OpenBSD may (or may not) make a mess of your disk! No freedom without responsibility. - NetBSD will try to warn you for a possibly dangerous + OpenBSD will try to warn you for a possibly dangerous partition table, but it's up to you to either take that warning serious or ignore it (there may be good reasons to ignore the warning, if you know what you're doing). So what do you do if you have a new disk, that will be exclusively - used by NetBSD? Very simple: don't let it get `infected' by the + used by OpenBSD? Very simple: don't let it get `infected' by the AHDI `virus'. ,-) Just connect the disk to your TT/Falcon; boot - NetBSD; run `disklabel -e'; you'll see only one large partiton `d' + OpenBSD; run `disklabel -e'; you'll see only one large partiton `d' (there won't be any filesytem on it yet); you can create partitions in any way you want, as you're no longer limited by an AHDI partition table. diff --git a/distrib/notes/atari/upgrade b/distrib/notes/atari/upgrade index 13201776e98..f53c1a87a89 100644 --- a/distrib/notes/atari/upgrade +++ b/distrib/notes/atari/upgrade @@ -19,7 +19,7 @@ actions: mount_ffs /dev/sd1a /mnt mount_ffs /dev/sd1d /mnt/usr -At this point, you can follow the section "Installing the NetBSD System" +At this point, you can follow the section "Installing the OpenBSD System" to install the sets. There is one difference: When Extract asks you "Are you installing a -current snapshot? [n]" answer 'y'. diff --git a/distrib/notes/atari/whatis b/distrib/notes/atari/whatis index d9f2b34e087..5e38de6fe75 100644 --- a/distrib/notes/atari/whatis +++ b/distrib/notes/atari/whatis @@ -1,2 +1,2 @@ -The Atari release stepped in in March 1995. This means the NetBSD1.1 -is the first official release of NetBSD/Atari. +The Atari release stepped in in March 1995. This means the OpenBSD1.1 +is the first official release of OpenBSD/Atari. diff --git a/distrib/notes/atari/xfer b/distrib/notes/atari/xfer index cb423915057..d1d9b8b16f6 100644 --- a/distrib/notes/atari/xfer +++ b/distrib/notes/atari/xfer @@ -6,9 +6,9 @@ No matter what you do, however, you'll need to have three disks handy, on which you will put the install and boot floppy images. All the images are available from the directory "atari/floppies", -under the root of the NetBSD tree at your favorite archive site. +under the root of the OpenBSD tree at your favorite archive site. -If you are using NetBSD/atari to make the floppies, you should use +If you are using OpenBSD/atari to make the floppies, you should use the command dd(1) to write the raw floppy images (.fs files) to the disk. To write onto fd0 use: @@ -29,8 +29,8 @@ you choose. The various methods are explained below. To prepare for installing via an GEMDOS partition: - To install NetBSD from an GEMDOS partition, you need to - get the NetBSD distribution sets you wish to install + To install OpenBSD from an GEMDOS partition, you need to + get the OpenBSD distribution sets you wish to install on your system on to an GEMDOS partition. All of the set_name.xx pieces can be placed in a single directory instead of separate ones for each distribution set. This @@ -43,8 +43,8 @@ To prepare for installing via an GEMDOS partition: To prepare for installing via a tape: - To install NetBSD from a tape, you need to somehow - get the NetBSD filesets you wish to install on + To install OpenBSD from a tape, you need to somehow + get the OpenBSD filesets you wish to install on your system on to the appropriate kind of tape, in tar format. diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents index 92aea172da6..0c6438e2336 100644 --- a/distrib/notes/hp300/contents +++ b/distrib/notes/hp300/contents @@ -1,8 +1,8 @@ -The hp300-specific portion of the NetBSD 1.1 release is found in the +The hp300-specific portion of the OpenBSD 1.1 release is found in the "hp300" subdirectory of the distribution. That subdirectory is laid out as follows: -.../NetBSD-1.1/hp300/ +.../OpenBSD-1.1/hp300/ binary/ hp300 binary distribution sets; see below. @@ -13,21 +13,21 @@ out as follows: security/ hp300 security distribution; see below. -The NetBSD/hp300 binary distribution sets contain the binaries which -comprise the NetBSD 1.1 release for the hp300. There are seven binary +The OpenBSD/hp300 binary distribution sets contain the binaries which +comprise the OpenBSD 1.1 release for the hp300. There are seven binary distribution sets, and the "security" distribution set. The binary distribution sets can be found in the "hp300/binary" subdirectory of -the NetBSD 1.1 distribution tree, and are as follows: +the OpenBSD 1.1 distribution tree, and are as follows: - base11 The NetBSD/hp300 1.1 base binary distribution. You + base11 The OpenBSD/hp300 1.1 base binary distribution. You MUST install this distribution set. It contains the - base NetBSD utilities that are necessary for the + base OpenBSD utilities that are necessary for the system to run and be minimally functional. It includes shared library support, and excludes everything described below. [ 7.2M gzipped, 19M uncompressed ] - comp11 The NetBSD/hp300 Compiler tools. All of the tools + comp11 The OpenBSD/hp300 Compiler tools. All of the tools relating to C and C++. This set includes the system include files (/usr/include), the linker, the compiler tool chain, and the various system libraries (except @@ -61,16 +61,16 @@ the NetBSD 1.1 distribution tree, and are as follows: installed from the source tree by default. [ 1.8M gzipped, 6.5M uncompressed ] - text11 This set includes NetBSD's text processing tools, + text11 This set includes OpenBSD's text processing tools, including groff, all related programs, and their manual pages. [ 770K gzipped, 2.8M uncompressed ] The hp300 security distribution set is named "secr11" and can be found -in the "hp300/security" subdirectory of the NetBSD 1.1 distribution +in the "hp300/security" subdirectory of the OpenBSD 1.1 distribution tree. It contains executables which are built in the "src/domestic" portion -if the NetBSD source tree. It can only be found on those sites which carry -the complete NetBSD distribution and that can legally obtain it. (Remember, +if the OpenBSD source tree. It can only be found on those sites which carry +the complete OpenBSD distribution and that can legally obtain it. (Remember, because of United States law, this distribution set may not be exported to locations outside of the United States and Canada.) [ 128K gzipped, 275K uncompressed ] @@ -86,11 +86,11 @@ The following are included in the `.../install' directory: SYS_NBOOT.gz A gzipped copy of the network boot block. This is useful if you are installing - a diskless NetBSD/hp300 system. + a diskless OpenBSD/hp300 system. inst-11.fs.gz A gzipped copy of the miniroot filesystem. - netbsd.gz A gzipped GENERIC kernel. + bsd.gz A gzipped GENERIC kernel. rbootd.tar.gz Source code for the rbootd(8) program, required for netbooting an HP workstation. diff --git a/distrib/notes/hp300/hardware b/distrib/notes/hp300/hardware index c2601896637..ceb157821b4 100644 --- a/distrib/notes/hp300/hardware +++ b/distrib/notes/hp300/hardware @@ -1,4 +1,4 @@ -NetBSD/hp300 1.1 will run on most HP 9000/300- and 400-series machines. +OpenBSD/hp300 1.1 will run on most HP 9000/300- and 400-series machines. The lowest amount of RAM that has been tested is 7.5M, though it may run with less. Certainly, if you wish to run X, more RAM is recommended. diff --git a/distrib/notes/hp300/prep b/distrib/notes/hp300/prep index ada1d72e51f..2159aa1f501 100644 --- a/distrib/notes/hp300/prep +++ b/distrib/notes/hp300/prep @@ -6,12 +6,12 @@ sectors. You must have this information before proceeding. The file `.../install/HP-IB.geometry' has geometry inforomation for several HP-IB disks, but may be incomplete. Geometry may be calculated from an HP-UX `/etc/disktab' entry, but note that HP-UX geometry is based on -1024 byte sectors, while NetBSD's is based on 512 byte sectors. +1024 byte sectors, while OpenBSD's is based on 512 byte sectors. QUICK NOTE ABOUT PARTITIONS: Since the target disk will become the boot -disk for your new NetBSD/hp300 installation, you will need to treat the +disk for your new OpenBSD/hp300 installation, you will need to treat the `a' and `c' partitions in a special manner. Due to the size of the -NetBSD/hp300 boot program (it spills into the area after the disklabel), +OpenBSD/hp300 boot program (it spills into the area after the disklabel), it is necessary to offset the `a' partition one cylinder from the beginning of the disk. Later, the `c' partition will be marked with the type `FS_BOOT' and may not be used for a filesystem. (For those unfamiliar @@ -19,7 +19,7 @@ with historic BSD partition conventions, the `c' partition is defined as `the entire disk', or the `raw partition'.) A QUICK NOTE ABOUT DISK NUMBERS: While in the SYS_INST program, you -may use different unit numbers for the disks than when the NetBSD +may use different unit numbers for the disks than when the OpenBSD kernel is running. The unit number for a disk while in SYS_INST is calculated with the following formula: @@ -66,14 +66,14 @@ the following from the `.../install' directory in addition to the items listed above: rbootd.tar.gz Source code for the rbootd program included with - NetBSD. It requires that the server have a + OpenBSD. It requires that the server have a Berkeley Packet Filter (bpf). You will need to compile this version of rbootd if your server system does not have this utility already. First of all, configure your rbootd to handle boot requests from the -client. NOTE: NetBSD's `rbootd' is slightly different from HP-UX's. -To configure NetBSD's `rbootd', create a file called `/etc/rbootd.conf' +client. NOTE: OpenBSD's `rbootd' is slightly different from HP-UX's. +To configure OpenBSD's `rbootd', create a file called `/etc/rbootd.conf' and place in it an entry like the following: 08:00:09:04:AA:33 SYS_INST # thunder-egg @@ -101,7 +101,7 @@ the space bar a few times. Shortly, you should see a menu of possible boot options appear. Select the option corresponding to SYS_INST. SYS_INST will load and prompt you for a command. -If this is a new NetBSD installation, you will need to place a disklabel +If this is a new OpenBSD installation, you will need to place a disklabel on the disk. sys_inst> disklabel diff --git a/distrib/notes/hp300/upgrade b/distrib/notes/hp300/upgrade index aa51832ae4e..b48a8225957 100644 --- a/distrib/notes/hp300/upgrade +++ b/distrib/notes/hp300/upgrade @@ -1,4 +1,4 @@ -It is possible to easily upgrade your existing NetBSD/hp300 system +It is possible to easily upgrade your existing OpenBSD/hp300 system using the upgrade program in the miniroot. If you wish to upgrade your system by this method, simply select the `upgrade' option once the miniroot has booted. The upgrade program with then guide you @@ -19,8 +19,8 @@ through the procedure. The upgrade program will: * Copy a new kernel onto your root partition. NOTE: the existing kernel WILL NOT be backed up; doing - so would be pointless, since a NetBSD 1.0 kernel will - not run NetBSD 1.1 executables. + so would be pointless, since a OpenBSD 1.0 kernel will + not run OpenBSD 1.1 executables. * Install a new boot block. @@ -33,7 +33,7 @@ manually. To do this, follow the following procedure: * Place _at least_ the `base' binary set in a filesystem accessible to the target machine. A local filesystem is preferred, since there may be incompatibilities - between the NetBSD 1.1 kernel and older route(8) + between the OpenBSD 1.1 kernel and older route(8) binaries. * Back up your pre-existing kernel and copy the 1.1 @@ -56,7 +56,7 @@ manually. To do this, follow the following procedure: sh /etc/netstart NOTE: the route(8) commands may fail due to potential - incompatibilities between route(8) and the NetBSD 1.1 + incompatibilities between route(8) and the OpenBSD 1.1 kernel. Once you have enabled the network, mount the NFS filesystems. If you use amd(8), you may or may not have to mount these filesystems manually. Your mileage diff --git a/distrib/notes/hp300/whatis b/distrib/notes/hp300/whatis index ba2c5cba869..777c5d527db 100644 --- a/distrib/notes/hp300/whatis +++ b/distrib/notes/hp300/whatis @@ -1,2 +1,2 @@ -This is the second public release of NetBSD for the HP 9000/300 series of +This is the second public release of OpenBSD for the HP 9000/300 series of computers. diff --git a/distrib/notes/hp300/xfer b/distrib/notes/hp300/xfer index 799a932f52f..0f5ef6642e1 100644 --- a/distrib/notes/hp300/xfer +++ b/distrib/notes/hp300/xfer @@ -69,12 +69,12 @@ To prepare for installing via FTP: All that is required in this case is that you have network access to an FTP server. This may be your - account on another system, or may even be ftp.NetBSD.ORG - itself. If you wish to use ftp.NetBSD.ORG as your FTP + account on another system, or may even be ftp.OpenBSD.ORG + itself. If you wish to use ftp.OpenBSD.ORG as your FTP file server, you may want to keep the following information handy: IP Address: 205.149.163.23 Login: anonymous Password: <your e-mail address> - Server path: /pub/NetBSD/NetBSD-1.1/hp300/binary + Server path: /pub/OpenBSD/OpenBSD-1.1/hp300/binary diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents index 0c3108e2417..c462024f9f3 100644 --- a/distrib/notes/i386/contents +++ b/distrib/notes/i386/contents @@ -1,8 +1,8 @@ -The i386-specific portion of the NetBSD 1.1 release is found in the +The i386-specific portion of the OpenBSD 1.1 release is found in the "i386" subdirectory of the distribution. That subdirectory is laid out as follows: -.../NetBSD-1.1/i386/ +.../OpenBSD-1.1/i386/ INSTALL Installation notes; this file. binary/ i386 binary distribution sets; @@ -19,7 +19,7 @@ out as follows: installation section, below. There are four i386 floppy images to be found in the "i386/floppy" -subdirectory of the NetBSD 1.1 distribution. Two of them are bootable +subdirectory of the OpenBSD 1.1 distribution. Two of them are bootable kernel-copy floppies, one is an installation floppy, and one is an upgrade floppy. They are all described in more detail below. There are gzipped versions of each available, for easier downloading. (The @@ -29,7 +29,7 @@ Bootable Kernel-copy floppies: These disks contain file systems, are bootable, and have enough utilities on board to copy a new kernel to your hard - disk once you have it partitioned for NetBSD. They make + disk once you have it partitioned for OpenBSD. They make upgrading to a new kernel easy, because all you have to do is get a new kernel-copy floppy with a new kernel, boot from it, and confirm that you want to have the kernel copied to your @@ -53,11 +53,11 @@ Bootable Kernel-copy floppies: installation. For those that cannot configure a custom kernel, two "generic" - kernel images, named "netbsd-adp.gz" and "netbsd-oth.gz", have + kernel images, named "bsd-adp.gz" and "bsd-oth.gz", have been placed in the binaries directory. These are identical - except that "netbsd-adp.gz" contains support for Adaptec SCSI + except that "bsd-adp.gz" contains support for Adaptec SCSI controllers, but no other SCSI controllers, and - "netbsd-oth.gz" contains support only for SCSI controllers + "bsd-oth.gz" contains support only for SCSI controllers other than the Adaptec. (These are similar in nature to the kernels on the kernel copy floppies but with additional device support.) It is strongly encouraged that you build a custom @@ -68,32 +68,32 @@ Bootable Kernel-copy floppies: Installation floppy: This disk contains the software necessary to prepare your hard - drive for NetBSD and install the NetBSD distribution. It is + drive for OpenBSD and install the OpenBSD distribution. It is not bootable, and must be used in conjunction with one of the kernel-copy floppies. This floppy is named "inst-11.fs". Upgrade floppy: This disk contains the software to be used in upgrading the - system from a previous version of NetBSD. It is not bootable, + system from a previous version of OpenBSD. It is not bootable, and must be used in conjunction with one of the kernel-copy floppies. This floppy is named "upgr11.fs" -The NetBSD/i386 binary distribution sets contain the binaries which -comprise the NetBSD 1.1 release for the i386. There are seven binary +The OpenBSD/i386 binary distribution sets contain the binaries which +comprise the OpenBSD 1.1 release for the i386. There are seven binary distribution sets, and the "security" distribution set. The binary distribution sets can be found in subdirectories of the "i386/binary" -subdirectory of the NetBSD 1.1 distribution tree, and are as follows: +subdirectory of the OpenBSD 1.1 distribution tree, and are as follows: - base11 The NetBSD/i386 1.1 base binary distribution. You + base11 The OpenBSD/i386 1.1 base binary distribution. You MUST install this distribution set. It contains the - base NetBSD utilities that are necessary for the + base OpenBSD utilities that are necessary for the system to run and be minimally functional. It includes shared library support, and excludes everything described below. [ 7.5M gzipped, 19.5M uncompressed ] - comp11 The NetBSD/i386 Compiler tools. All of the tools + comp11 The OpenBSD/i386 Compiler tools. All of the tools relating to C, C++, and FORTRAN (yes, there are two!). This set includes the system include files (/usr/include), the linker, the compiler tool chain, @@ -128,20 +128,20 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows: installed from the source tree by default. [ 1.9M gzipped, 6.6M uncompressed ] - text11 This set includes NetBSD's text processing tools, + text11 This set includes OpenBSD's text processing tools, including groff, all related programs, and their manual pages. [ 0.8M gzipped, 2.9M uncompressed ] The i386 security distribution set is named "secr11" and can be found -in the "i386/security" subdirectory of the NetBSD 1.1 distribution +in the "i386/security" subdirectory of the OpenBSD 1.1 distribution tree. It contains crypt.c (the source file for the DES encryption algorithm) and the binaries which depend on it, as well as the "bdes" DES encryption program. You do not need this distribution set to use encrypted passwords in your password file; the "base11" distribution includes a crypt library which can perform only the decryption function. The "secr11" distribution set can be found only on those sites which -carry the complete NetBSD distribution and which can legally obtain it. +carry the complete OpenBSD distribution and which can legally obtain it. (Remember, because of United States law, this distribution set may not be exported to locations outside of the United States and Canada.) [ 154K gzipped, 358K uncompressed ] diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware index 75576c9d186..58e78eb4e9c 100644 --- a/distrib/notes/i386/hardware +++ b/distrib/notes/i386/hardware @@ -1,4 +1,4 @@ -NetBSD/i386 1.1 runs on ISA (AT-Bus), EISA, PCI, and VL-bus systems +OpenBSD/i386 1.1 runs on ISA (AT-Bus), EISA, PCI, and VL-bus systems with 386-family processors, with or without math coprocessors. It does NOT support MCA systems, such as some IBM PS/2 systems. The minimal configuration is said to require 4M of RAM and 50M of disk space, @@ -38,7 +38,7 @@ Supported devices include: Future Domain TMC-950 MDA, CGA, VGA, SVGA, and HGC Display Adapters. (Note that not - all of the display adapters NetBSD/i386 can work with + all of the display adapters OpenBSD/i386 can work with are supported by X. See the XFree86 FAQ for more information.) Serial ports: @@ -100,8 +100,8 @@ Drivers for hardware marked with "[*]" are NOT included on the distribution floppies. Except as noted above, all other drivers are present on both kernel-copy disks. Also, at the present time, the distributed kernels support only one SCSI host adapter per machine. -NetBSD normally allows more, though, so if you have more than one, you -can use all of them by compiling a custom kernel once NetBSD is +OpenBSD normally allows more, though, so if you have more than one, you +can use all of them by compiling a custom kernel once OpenBSD is installed. Support for devices marked with "[+]" IS included in the "generic" kernels, diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install index 5c9fee5ea2e..a9d71c9941b 100644 --- a/distrib/notes/i386/install +++ b/distrib/notes/i386/install @@ -1,4 +1,4 @@ -Installing NetBSD is a relatively complex process, but if you have +Installing OpenBSD is a relatively complex process, but if you have this document in hand and are careful to read and remember the information which is presented to you by the install program, it shouldn't be too much trouble. @@ -7,25 +7,25 @@ Before you begin, you should know the geometry of your hard disk, i.e. the sector size (note that sector sizes other than 512 bytes are not currently supported), the number of sectors per track, the number of tracks per cylinder (also known as the number of heads), and the -number of cylinders on the disk. The NetBSD kernel will try to +number of cylinders on the disk. The OpenBSD kernel will try to discover these parameters on its own, and if it can it will print them at boot time. If possible, you should use the parameters it prints. (You might not be able to because you're sharing your disk with another operating system, or because your disk is old enough that the kernel can't figure out its geometry.) -If NetBSD will be sharing the disk with DOS or another operating +If OpenBSD will be sharing the disk with DOS or another operating system, you should have already completed the section of these notes that instructed you on how to prepare your hard disk. You should know -the size of the NetBSD area of the disk and its offset from the +the size of the OpenBSD area of the disk and its offset from the beginning of the disk. You will need this information when setting up -your NetBSD partitions. +your OpenBSD partitions. -You should now be ready to install NetBSD. It might be handy for you +You should now be ready to install OpenBSD. It might be handy for you to have a pencil, some paper, and a calculator handy. The following is a walk-through of the steps you will take while -getting NetBSD installed on your hard disk. If any question has a +getting OpenBSD installed on your hard disk. If any question has a default answer, it will be displayed in brackets ("[]") after the question. If you wish to stop the installation, you may hit Control-C at any time, but if you do, you'll have to begin the installation @@ -39,7 +39,7 @@ process again from scratch. kernel-copy floppy image to a different disk, and using that. If that doesn't work, try booting after disabling your CPU's internal and external caches (if any). If it still doesn't - work, NetBSD probably can't be run on your hardware. This can + work, OpenBSD probably can't be run on your hardware. This can probably be considered a bug, so you might want to report it. If you do, please include as many details about your system configuration as you can. @@ -59,12 +59,12 @@ process again from scratch. disk (the "inst-11" floppy) is writable, insert it into the floppy drive, and hit any key. - You will then be presented with the NetBSD kernel boot + You will then be presented with the OpenBSD kernel boot messages. You will want to read them, to determine your disk's name and geometry. Its name will be something like "sd0" or "wd0" and the geometry will be printed on a line that begins with its name. As mentioned above, you will need your - disk's geometry when creating NetBSD's partitions. You will + disk's geometry when creating OpenBSD's partitions. You will also need to know the name, to tell the install tools what disk to install on. @@ -118,7 +118,7 @@ process again from scratch. asked about which units you wish to use, and you should reply with "c" for cylinders, or "s" for sectors. - You will be asked for the size of the NetBSD portion of the + You will be asked for the size of the OpenBSD portion of the disk. If you're installing on the whole disk, reply with the size of the disk, as printed earlier by the install program. If you're using only part of the disk, reply with the size @@ -126,12 +126,12 @@ process again from scratch. enter the size in the units you specified in the last step!) If you are not installing on the whole disk, you will be asked - fro the offset of the NetBSD partition from the beginning of + fro the offset of the OpenBSD partition from the beginning of the disk. Reply with the appropriate offset (again, in whichever units you specified), as determined by how you set up your disk using the partition editor. - You will be asked to enter the size of your NetBSD root + You will be asked to enter the size of your OpenBSD root partition. It should be at least 13M, but if you are going to be doing development, 14-16M is a more desirable size. This size should be expressed in units of sectors or cylinders, @@ -154,7 +154,7 @@ process again from scratch. separate partition. That can be done with these installation tools, but is not covered here.) The install program will tell you how much space there is left to be allocated in the - NetBSD area of the disk, and, if you only want one more + OpenBSD area of the disk, and, if you only want one more partition ("/usr"), you should enter it at the prompt when the installer asks you how large the next partition should be. It will then ask you for the name of the mount point for that @@ -163,7 +163,7 @@ process again from scratch. YOU ARE NOW AT THE POINT OF NO RETURN. Nothing has been written to your disk yet, but if you confirm that you want to - install NetBSD, your hard drive will be modified, and its + install OpenBSD, your hard drive will be modified, and its contents may be scrambled at the whim of the install program. This is especially likely if you have given the install program incorrect information. If you are sure you want to @@ -171,7 +171,7 @@ process again from scratch. The install program will now label your disk and make the file systems you specified. The filesystems will be initialized to - contain NetBSD bootstrapping binaries and configuration files. + contain OpenBSD bootstrapping binaries and configuration files. It will also create an /etc/fstab for your system, and mount all of the file systems under /mnt. (In other words, your root partition will be mounted on /mnt, your /usr partition on @@ -236,7 +236,7 @@ process again from scratch. extracted. (Note: if you know that you will be running low on - disk space when installing NetBSD, you can load and + disk space when installing OpenBSD, you can load and extract one distribution set at a time. To do this, load only the floppies which contain the files for the first distribution set, extract them, and then change @@ -406,7 +406,7 @@ process again from scratch. expects that you have installed the "base11" and "etc11" distribution sets. If you have not, you will not be able to run it successfully (nor will you have a functional system, in - any case). To configure your newly-installed NetBSD system, + any case). To configure your newly-installed OpenBSD system, run the command "Configure". It will ask you for the system's host name, domain name, and other network configuration information. It will set up your configuration files and make @@ -416,7 +416,7 @@ Kernel Installation: Enter "halt" at the prompt to halt the system. When the system is halted, remove the "inst-11" floppy from the floppy - drive, and replace it with the NetBSD 1.1 kernel-copy floppy + drive, and replace it with the OpenBSD 1.1 kernel-copy floppy that you previously booted from. Reboot with that floppy. with that floppy. @@ -445,13 +445,13 @@ Kernel Installation: Once the system is halted, remove the kernel-copy floppy from the floppy disk drive, and hit any key to reboot. -Congratulations, you have successfully installed NetBSD 1.1. When you -reboot into NetBSD, you should log in as "root" at the login prompt. +Congratulations, you have successfully installed OpenBSD 1.1. When you +reboot into OpenBSD, you should log in as "root" at the login prompt. There is no initial password, but if you're using the machine in a networked environment, you should create yourself an account and protect it and the "root" account with good passwords. -Some of the files in the NetBSD 1.1 distribution might need to be +Some of the files in the OpenBSD 1.1 distribution might need to be tailored for your site. In particular, the /etc/sendmail.cf file will almost definitely need to be adjusted, and other files in /etc will probably need to be modified, as well. If you are unfamiliar with diff --git a/distrib/notes/i386/prep b/distrib/notes/i386/prep index b7b93a8166e..73c3a12006f 100644 --- a/distrib/notes/i386/prep +++ b/distrib/notes/i386/prep @@ -1,8 +1,8 @@ -NOTE: If you wish to install NetBSD on your whole disk, i.e. you do +NOTE: If you wish to install OpenBSD on your whole disk, i.e. you do not want DOS or any other operating system to reside on your hard disk, you can skip this section and go on to the section that describes installation, below. If you're upgrading your system from a -previous release of NetBSD, you shouldn't have proceeded directly to +previous release of OpenBSD, you shouldn't have proceeded directly to the section about upgrading; you need none of the information presented here. @@ -12,13 +12,13 @@ wish to keep. Repartitioning your hard disk is an excellent way to destroy important data. Second, if you are using a disk controller which supports disk -geometry translation, be sure to use the same parameters for NetBSD as +geometry translation, be sure to use the same parameters for OpenBSD as for DOS or the other operating systems installed on your disk. If you -do not, it will be much harder to make NetBSD properly coexist with +do not, it will be much harder to make OpenBSD properly coexist with them. Utilities exist which will print out the disk geometry which DOS sees; some versions of DOS "fdisk" also do this. If you have an "EIDE" -hard disk, DOS and NetBSD probably won't see the same geometry, and you -must be careful to find out the DOS geometry and tell NetBSD about it +hard disk, DOS and OpenBSD probably won't see the same geometry, and you +must be careful to find out the DOS geometry and tell OpenBSD about it during the installation. Third (but related to the second point above), if you are using a hard @@ -27,7 +27,7 @@ some kind of software translation utility or other kludge, you MUST BE SURE that all partitions which you want to boot from must start below cylinder 1024 by the BIOS's idea of the disk, and that all DOS partitions MUST EXIST ENTIRELY BELOW cylinder 1024, or you will either not be able to -boot NetBSD, not be able to boot DOS, or you may experience data loss or +boot OpenBSD, not be able to boot DOS, or you may experience data loss or filesystem corruption. Be sure you aren't using geometry translation that you don't know about, but that the DOS "fdisk" program does! @@ -35,9 +35,9 @@ Fourth, use the DOS "fdisk" program or another partition editor to repartition your hard disk. Create a partition of at least 40M in size (preferably much larger), and note its starting offset and its length (preferably in units of disk sectors or cylinders). You will -need that information when installing NetBSD (and if the offset and +need that information when installing OpenBSD (and if the offset and length are not in those units, you will have to convert them). Once -you have created the new NetBSD partition, mark it as having a +you have created the new OpenBSD partition, mark it as having a partition type of 0xA5 (165, in decimal). If you used "fdisk" to partition your disk, you will probably have to use a different partition editor to mark the partition with the correct type. @@ -51,5 +51,5 @@ systems will have different needs; most will need to reformat the partition, and if it was their "main" partition, will probably need to be reinstalled. -Your hard disk is now prepared to have NetBSD installed on it, and +Your hard disk is now prepared to have OpenBSD installed on it, and you should proceed with the installation instructions. diff --git a/distrib/notes/i386/upgrade b/distrib/notes/i386/upgrade index 1755622a6ea..35126ecefcf 100644 --- a/distrib/notes/i386/upgrade +++ b/distrib/notes/i386/upgrade @@ -1,4 +1,4 @@ -The upgrade to NetBSD 1.1 is a binary upgrade; it would be prohibitive +The upgrade to OpenBSD 1.1 is a binary upgrade; it would be prohibitive to make users upgrade by compiling and installing the 1.1 sources, and it would be very difficult to even compile a set of instructions that allowed them to do so. Because of the many changes to the system, it @@ -16,10 +16,10 @@ which weren't previously on the system. If you have a few megabytes free on each of your root and /usr partitions, you should have enough space. -Since upgrading involves replacing the boot blocks on your NetBSD +Since upgrading involves replacing the boot blocks on your OpenBSD partition, the kernel, and most of the system binaries, it has the potential to cause data loss. You are strongly advised to BACK UP ANY -IMPORTANT DATA ON YOUR DISK, whether on the NetBSD partition or on +IMPORTANT DATA ON YOUR DISK, whether on the OpenBSD partition or on another operating system's partition, before beginning the upgrade process. @@ -55,7 +55,7 @@ To upgrade your system, follow the following instructions: probably do it manually after the install process is complete, by using "fsck -c 2". Read the fsck(8) manual page for more details. Note that this step is only important when upgrading - from a pre-NetBSD 1.0 release. + from a pre-OpenBSD 1.0 release. The upgrade program will then check your root file system, and, if you approved, will upgrade it to the new file system @@ -70,7 +70,7 @@ To upgrade your system, follow the following instructions: file systems under /mnt. (In other words, your root partition will be mounted on /mnt, your /usr partition on /mnt/usr, etc.) - If you don't already have the NetBSD distribution sets on your + If you don't already have the OpenBSD distribution sets on your disk, look in the installation section for information on how to transfer them to your disk. @@ -84,7 +84,7 @@ To upgrade your system, follow the following instructions: incrementally from your lone floppy drive. Once the distribution sets are transferred to your disk, - continue here. (Obviously, if the NetBSD distribution sets + continue here. (Obviously, if the OpenBSD distribution sets are already on your disk, because you've transferred them before starting the upgrade process, you don't need to transfer them again now!) @@ -117,7 +117,7 @@ To upgrade your system, follow the following instructions: it is complete, you should use "halt" to halt the system. When the system is halted, remove the "upgr11" floppy from - the floppy drive, and replace it with the NetBSD 1.1 + the floppy drive, and replace it with the OpenBSD 1.1 kernel-copy floppy that you previously booted from. Reboot with that floppy. @@ -146,17 +146,17 @@ To upgrade your system, follow the following instructions: Once the system is halted, remove the kernel-copy floppy from the floppy disk drive, and hit any key to reboot. -Your system has now been upgraded to NetBSD 1.1. +Your system has now been upgraded to OpenBSD 1.1. After a new kernel has been copied to your hard disk, your - machine is a complete NetBSD 1.1 system. However, that + machine is a complete OpenBSD 1.1 system. However, that doesn't mean that you're finished with the upgrade process. There are several things that you should do, or might have to do, to insure that the system works properly. First, if you did not upgrade your file systems to the new file system format during the upgrade process, and you are - upgrading from a pre-1.0 NetBSD, you may want to do so now, + upgrading from a pre-1.0 OpenBSD, you may want to do so now, with "fsck -c 2". If you are unsure about the process, it's suggested that you read the fsck(8) manual page. @@ -185,9 +185,9 @@ Your system has now been upgraded to NetBSD 1.1. page.) Finally, you will want to delete old binaries that were part - of the version of NetBSD that you upgraded from and have since - been removed from the NetBSD distribution. If you are - upgrading from a pre-1.0 NetBSD, you might also + of the version of OpenBSD that you upgraded from and have since + been removed from the OpenBSD distribution. If you are + upgrading from a pre-1.0 OpenBSD, you might also want to recompile any locally-built binaries, to take advantage of the shared libraries. (Note that any new binaries that you build will be dynamically linked, and diff --git a/distrib/notes/i386/whatis b/distrib/notes/i386/whatis index a33e11820a7..9ced3ca9c12 100644 --- a/distrib/notes/i386/whatis +++ b/distrib/notes/i386/whatis @@ -1,13 +1,13 @@ -For the i386, NetBSD 1.1 brings greatly improved performance, +For the i386, OpenBSD 1.1 brings greatly improved performance, stability, and device support. Emulation for several UN*X and UN*X like operating systems, including Linux and FreeBSD, has been added. Many new PCI devices are supported, such as cards based on the AMD PCnet-PCI Ethernet chip, the Digital DC21x4x family of Ethernet chips, and the Adaptec AIC7870 SCSI host adapter chip. Some drivers such as -"ccd" which previously only worked on other ports of NetBSD now work +"ccd" which previously only worked on other ports of OpenBSD now work on the i386 port. Though still not known to be entirely stable, the "ncr" driver for 53c8xx-series SCSI adapters has had substantial bugs and performance issues resolved. -NetBSD 1.1 on i386 is also fully backward compatible with old NetBSD +OpenBSD 1.1 on i386 is also fully backward compatible with old OpenBSD i386 binaries, so you don't need to recompile all your local programs. diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer index 587423b3b05..5507715cf88 100644 --- a/distrib/notes/i386/xfer +++ b/distrib/notes/i386/xfer @@ -9,7 +9,7 @@ No matter which installation medium you choose, you'll need to have two floppy disks (either 1.2M or 1.44 will work, though both should be the same type). On the first, you'll put the kernel-copy image that's appropriate for your system. On the second, you'll put the install or -upgrade floppy image, depending on whether you're installing NetBSD +upgrade floppy image, depending on whether you're installing OpenBSD for the first time, or upgrading a previous installation. If you are using an Adaptec SCSI host adapter, you need the kcadp11.fs @@ -27,7 +27,7 @@ possibilities is beyond the scope of this document. If you are using DOS to write the floppy images to disks, you should use the "rawrite" utility, provided in the "i386/utilities" directory -of the NetBSD distribution. It will write the file system images (.fs +of the OpenBSD distribution. It will write the file system images (.fs files) to disks. Note that, when installing, the kernel-copy floppy can be write-protected @@ -40,7 +40,7 @@ Obviously, the steps necessary to prepare the distribution sets for installation or upgrade depend on which installation medium you choose. The steps for the various media are outlined below. -To install or upgrade NetBSD using DOS floppies, you need to do the +To install or upgrade OpenBSD using DOS floppies, you need to do the following: Count the number of "set_name.xx" files that make up the @@ -70,14 +70,14 @@ following: Once you have the files on DOS disks, you can proceed to the next step in the installation or upgrade process. If you're - installing NetBSD from scratch, go to the section on preparing + installing OpenBSD from scratch, go to the section on preparing your hard disk, below. If you're upgrading an existing installation, go directly to the section on upgrading. -To install or upgrade NetBSD using a tape, you need to do the +To install or upgrade OpenBSD using a tape, you need to do the following: - To install NetBSD from a tape, you need to make a tape that + To install OpenBSD from a tape, you need to make a tape that contains the distribution set files, in "tar" format. If you're making the tape on a UN*X-like system, the easiest way to do so is probably something like: @@ -95,7 +95,7 @@ following: minimum installation to a new disk), you would do the following: - cd .../NetBSD-1.1 # the top of the tree + cd .../OpenBSD-1.1 # the top of the tree cd i386/binary tar cf <tape_device> base11 etc11 @@ -104,11 +104,11 @@ following: Once you have the files on the tape, you can proceed to the next step in the installation or upgrade process. If you're - installing NetBSD from scratch, go to the section on preparing + installing OpenBSD from scratch, go to the section on preparing your hard disk, below. If you're upgrading an existing installation, go directly to the section on upgrading. -To install or upgrade NetBSD using a remote partition, mounted via +To install or upgrade OpenBSD using a remote partition, mounted via NFS, you must do the following: NOTE: This method of installation is recommended only for @@ -117,9 +117,9 @@ NFS, you must do the following: this documentation should help, but is not intended to be all-encompassing. - Place the NetBSD distribution sets you wish to install into a + Place the OpenBSD distribution sets you wish to install into a directory on an NFS server, and make that directory mountable - by the machine on which you are installing or upgrading NetBSD. + by the machine on which you are installing or upgrading OpenBSD. This will probably require modifying the /etc/exports file on of the NFS server and resetting its mount daemon (mountd). (Both of these actions will probably require superuser @@ -127,19 +127,19 @@ NFS, you must do the following: You need to know the the numeric IP address of the NFS server, and, if the server is not on a network directly connected to - the machine on which you're installing or upgrading NetBSD, + the machine on which you're installing or upgrading OpenBSD, you need to know the numeric IP address of the router closest - to the NetBSD machine. Finally, you need to know the numeric - IP address of the NetBSD machine itself. + to the OpenBSD machine. Finally, you need to know the numeric + IP address of the OpenBSD machine itself. Once the NFS server is set up properly and you have the information mentioned above, you can proceed to the next step in the installation or upgrade process. If you're installing - NetBSD from scratch, go to the section on preparing your hard + OpenBSD from scratch, go to the section on preparing your hard disk, below. If you're upgrading an existing installation, go directly to the section on upgrading. -To install or upgrade NetBSD by using FTP to get the installation +To install or upgrade OpenBSD by using FTP to get the installation sets, you must do the following: NOTE: This method of installation is recommended only for @@ -150,23 +150,23 @@ sets, you must do the following: The preparations for this installation/upgrade method are easy; all you make sure that there's some FTP site from which - you can retrieve the NetBSD distribution when you're about to + you can retrieve the OpenBSD distribution when you're about to install or upgrade. You need to know the numeric IP address of that site, and, if it's not on a network directly connected - to the machine on which you're installing or upgrading NetBSD, + to the machine on which you're installing or upgrading OpenBSD, you need to know the numeric IP address of the router closest - to the NetBSD machine. Finally, you need to know the numeric - IP address of the NetBSD machine itself. + to the OpenBSD machine. Finally, you need to know the numeric + IP address of the OpenBSD machine itself. Once you have this information, you can proceed to the next step in the installation or upgrade process. If you're - installing NetBSD from scratch, go to the section on + installing OpenBSD from scratch, go to the section on preparing your hard disk, below. If you're upgrading an existing installation, go directly to the section on upgrading. -If you are upgrading NetBSD, you also have the option of installing -NetBSD by putting the new distribution sets somewhere in your existing +If you are upgrading OpenBSD, you also have the option of installing +OpenBSD by putting the new distribution sets somewhere in your existing file system, and using them from there. To do that, you must do the following: diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents index a9db9b5ec45..56336465bc5 100644 --- a/distrib/notes/mac68k/contents +++ b/distrib/notes/mac68k/contents @@ -1,8 +1,8 @@ -The mac68k-specific portion of the NetBSD 1.1 release is found in the +The mac68k-specific portion of the OpenBSD 1.1 release is found in the "mac68k" subdirectory of the distribution. That subdirectory is laid out as follows: -.../NetBSD-1.1/mac68k/ +.../OpenBSD-1.1/mac68k/ binary/ mac68k binary distribution sets; see below. @@ -11,26 +11,26 @@ out as follows: utils/ The mac68k installation utilities. -The NetBSD/mac68k binary distribution sets contain the binaries which -comprise the NetBSD 1.1 release for the mac68k. There are eight binary +The OpenBSD/mac68k binary distribution sets contain the binaries which +comprise the OpenBSD 1.1 release for the mac68k. There are eight binary distribution sets, and the "security" distribution set. The binary distribution sets can be found in subdirectories of the "mac68k/binary" -subdirectory of the NetBSD 1.1 distribution tree, and are as follows: +subdirectory of the OpenBSD 1.1 distribution tree, and are as follows: - netbsd10 The NetBSD/mac68k 1.1 kernel binary. You MUST + bsd10 The OpenBSD/mac68k 1.1 kernel binary. You MUST install this file. It is the kernel that you need to boot the system. [ 307K gzipped, 610K uncompressed ] - base11 The NetBSD/mac68k 1.1 base binary distribution. You + base11 The OpenBSD/mac68k 1.1 base binary distribution. You MUST install this distribution set. It contains the - base NetBSD utilities that are necessary for the + base OpenBSD utilities that are necessary for the system to run and be minimally functional. It includes shared library support, and excludes everything described below. [ 6.2M gzipped, 18.4M uncompressed ] - comp11 The NetBSD/mac68k Compiler tools. All of the tools + comp11 The OpenBSD/mac68k Compiler tools. All of the tools relating to C, C++, and FORTRAN (yes, there are two!). This set includes the system include files (/usr/include), the linker, the compiler tool chain, @@ -65,16 +65,16 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows: installed from the source tree by default. [ 1.6M gzipped, 5.7M uncompressed ] - text11 This set includes NetBSD's text processing tools, + text11 This set includes OpenBSD's text processing tools, including groff, all related programs, and their manual pages. [ 0.8M gzipped, 2.9M uncompressed ] The mac68k security distribution set is named "secr11" and can be found -in the "mac68k/security" subdirectory of the NetBSD 1.1 distribution +in the "mac68k/security" subdirectory of the OpenBSD 1.1 distribution tree. It contains the crypt libraries (for the DES encryption algorithm) and the binaries which depend on it. It can only be found on those sites -which carry the complete NetBSD distribution and that can legally obtain +which carry the complete OpenBSD distribution and that can legally obtain it. (Remember, because of United States law, this distribution set may not be exported to locations outside of the United States and Canada.) [ 109K gzipped, 260K uncompressed ] diff --git a/distrib/notes/mac68k/hardware b/distrib/notes/mac68k/hardware index e79d130cd02..d28ac081e8d 100644 --- a/distrib/notes/mac68k/hardware +++ b/distrib/notes/mac68k/hardware @@ -1,9 +1,9 @@ -NetBSD/mac68k 1.1 runs on several of the older Macintosh computers. +OpenBSD/mac68k 1.1 runs on several of the older Macintosh computers. 4MB of RAM should be sufficient to boot and the system can probably be squeezed onto a 40MB hard disk by leaving off a package or two. To actually do much compiling or anything more interesting than booting, at least 8MB of RAM and more disk space is recommended. -About 50MB will be necessary to install all of the NetBSD 1.1 binary +About 50MB will be necessary to install all of the OpenBSD 1.1 binary distribution (note that this does not count swap space!). Much more disk space is required to install the source and objects as well (about another 105MB). diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install index 0a5aa763830..cde3b1a7686 100644 --- a/distrib/notes/mac68k/install +++ b/distrib/notes/mac68k/install @@ -69,7 +69,7 @@ If you are installing onto a single root partition, proceed to the Installation of base files: Select the "Install" menu item from the "File" menu and install - base11, netbsd, and any other packages you wish to install at + base11, bsd, and any other packages you wish to install at this time (see the contents section for information about what's in each package). The installer will print out the filename of each file as it is installed, and will take quite some time to @@ -90,7 +90,7 @@ Installation of base files: Double-click on the MacBSD Booter icon to start the application. Check that the options in the Booting dialog look sane--especially the SCSI ID. If not, correct them to your preference. When you are satisfied with -your choices, try booting NetBSD. +your choices, try booting OpenBSD. If you wish to save your preferences, choose the "Save Preferences" option in the "File" menu, then quit the application and restart. Due @@ -105,13 +105,13 @@ If the system does not come up: you saw. If the system does come up, congratulations, you have successfully -installed NetBSD 1.1. When you reboot into NetBSD, you should log +installed OpenBSD 1.1. When you reboot into OpenBSD, you should log in as "root" at the login prompt. There is no initial password, but if you're using the machine in a networked environment, you should create yourself an account and protect it and the "root" account with good passwords. -Some of the files in the NetBSD 1.1 distribution might need to be +Some of the files in the OpenBSD 1.1 distribution might need to be tailored for your site. In particular, the /etc/sendmail.cf file will almost definitely need to be adjusted, and other files in /etc will probably need to be modified, as well. If you are unfamiliar with diff --git a/distrib/notes/mac68k/prep b/distrib/notes/mac68k/prep index 8f6a5552df9..28eb1a07e55 100644 --- a/distrib/notes/mac68k/prep +++ b/distrib/notes/mac68k/prep @@ -30,4 +30,4 @@ and a larger /usr. If you plan to use this machine as a server, you may also want a separate /var. Create these partitions as the BSD "usr" or "User slice X" type. -You are now set to install NetBSD on your hard drive. +You are now set to install OpenBSD on your hard drive. diff --git a/distrib/notes/mac68k/upgrade b/distrib/notes/mac68k/upgrade index 45aa0fede7e..946e4a4a9bb 100644 --- a/distrib/notes/mac68k/upgrade +++ b/distrib/notes/mac68k/upgrade @@ -1,4 +1,4 @@ -There is no upgrade to release 1.1 for the NetBSD/mac68k architecture. +There is no upgrade to release 1.1 for the OpenBSD/mac68k architecture. It is hoped that there will be a good upgrade procedure for future releases. Please feel free to volunteer to help replace these installation tools. diff --git a/distrib/notes/mac68k/whatis b/distrib/notes/mac68k/whatis index 36fa16171e1..8340c922b03 100644 --- a/distrib/notes/mac68k/whatis +++ b/distrib/notes/mac68k/whatis @@ -1,3 +1,3 @@ -NetBSD 1.1 is the second "real" release of NetBSD for the mac68k. +OpenBSD 1.1 is the first release of OpenBSD for the mac68k. There is still a lot of work to be done and help is welcomed, but this should be a usable system for a number of people. diff --git a/distrib/notes/mirrors b/distrib/notes/mirrors index 5b85c67cf93..b44cea5fe04 100644 --- a/distrib/notes/mirrors +++ b/distrib/notes/mirrors @@ -1,58 +1,5 @@ Host name Services Provided ---- ---- -------- -------- -ftp.iastate.edu Anonymous FTP, AFS - Anon-FTP path: pub/netbsd - AFS path: /afs/iastate.edu/public/ftp/pub/netbsd - -ftp.eecs.umich.edu Anonymous FTP - - Anon-FTP path: BSD/NetBSD - -gatekeeper.dec.com Anonymous FTP - - Anon-FTP path: pub/BSD/NetBSD - -wipux2.wifo.uni-mannheim.de Anonymous FTP, SUP - - Anon-FTP path: pub/NetBSD - SUP: get the file pub/misc/sup/supfile.example via - anonymous FTP and read it as an example. - -ftp.demon.co.uk Anonymous FTP, possibly SUP - - Anon-FTP path: pub/BSD/NetBSD - SUP: contact peter@demon.net for SUP server status/information - -ftp.uni-regensburg.de Anonymous FTP - - Anon-FTP path: pub/NetBSD - -ftp.unit.no Anonymous FTP - - Anon-FTP path: pub/NetBSD - -ftp.stacken.kth.se Anonymous FTP - - Anon-FTP path: pub/OS/NetBSD - -flick.lerc.nasa.gov Anonymous FTP - - Anon-FTP path: pub/NetBSD - -coombs.anu.edu.au Anonymous FTP - - Anon-FTP path: pub/NetBSD - -ftp.funet.fi Anonymous FTP - - Anon-FTP path: pub/unix/NetBSD - -ftp.netbsd.org Anonymous FTP, SUP - - Anon-FTP path: pub/NetBSD - SUP: get the file pub/sup/README.sup via anonymous FTP from - ftp.netbsd.org, and read it for instructions. - -If you wish to become a distribution site for NetBSD, contact -mirrors@netbsd.org. +If you wish to become a distribution site for OpenBSD, contact +mirrors@openbsd.org. diff --git a/distrib/notes/pc532/contents b/distrib/notes/pc532/contents index 5c9b7065e6e..4fd8b2cd617 100644 --- a/distrib/notes/pc532/contents +++ b/distrib/notes/pc532/contents @@ -1,14 +1,14 @@ -The pc532-specific portion of the NetBSD 1.1 release is found in the +The pc532-specific portion of the OpenBSD 1.1 release is found in the "pc532" subdirectory of the distribution. That subdirectory contains the files as follows: -.../NetBSD-1.1/pc532/ +.../OpenBSD-1.1/pc532/ INSTALL Installation notes; this file. CKSUM output of "cksum *.gz" inst-11.fs.gz Installation file system. download.c.gz Source for a pc532 ROM compat download pgm - netbsd.default.gz Upgrade kernel + bsd.default.gz Upgrade kernel base.tar.gz base distribution comp.tar.gz compiler tools & libraries etc.tar.gz files for /etc @@ -21,15 +21,15 @@ the files as follows: The binary distribution consists of the following files: base.tar.gz - The NetBSD/pc532 1.1 base binary distribution. You + The OpenBSD/pc532 1.1 base binary distribution. You MUST install this distribution set. It contains the - base NetBSD utilities that are necessary for the + base OpenBSD utilities that are necessary for the system to run and be minimally functional. It excludes everything described below. [ 6.8M gzipped ] comp.tar.gz - The NetBSD/pc532 Compiler tools. All of the tools + The OpenBSD/pc532 Compiler tools. All of the tools relating to C, C++, and FORTRAN (yes, there are two!). This set includes the system include files (/usr/include), the linker, the compiler tool chain, @@ -67,7 +67,7 @@ The binary distribution consists of the following files: [ 1.9M gzipped ] text.tar.gz - This set includes NetBSD's text processing tools, + This set includes OpenBSD's text processing tools, including groff, all related programs, and their manual pages. [ 0.8M gzipped ] @@ -80,7 +80,7 @@ recompile the following programs: skeyinit, su, tn3270, pppd -The initial installation process on a pc532 without NetBSD/pc532 +The initial installation process on a pc532 without OpenBSD/pc532 is supported by the following files: Initial file system used via SCSI floppy or downloaded into @@ -98,5 +98,5 @@ is supported by the following files: The upgrade process is supported by having a copy of a 1.1 kernel available. This file is: - netbsd.default.gz -- a kernel produced from the DEFAULT + bsd.default.gz -- a kernel produced from the DEFAULT configuration file in pc532/conf. diff --git a/distrib/notes/pc532/hardware b/distrib/notes/pc532/hardware index d872fe8c5fa..9deee660bed 100644 --- a/distrib/notes/pc532/hardware +++ b/distrib/notes/pc532/hardware @@ -1,4 +1,4 @@ -NetBSD/pc532 1.1 runs on a PC532 computer. It supports a subset of the +OpenBSD/pc532 1.1 runs on a PC532 computer. It supports a subset of the "standard" hardware to date. This is defined as: 4 - 32 Megs of memory @@ -9,12 +9,12 @@ NetBSD/pc532 1.1 runs on a PC532 computer. It supports a subset of the Some SCSI CD-ROM drives work The Matthias Pfaller Parallel Port. -NetBSD/pc532 currently expects the ROM monitor to be the "autoboot +OpenBSD/pc532 currently expects the ROM monitor to be the "autoboot monitor" of Oct/Nov 1991. It includes support to set up auto booting -of NetBSD, including a secondary boot program that the autoboot monitor -will load that in turn loads the NetBSD kernel from a NetBSD file system. +of OpenBSD, including a secondary boot program that the autoboot monitor +will load that in turn loads the OpenBSD kernel from a OpenBSD file system. -Most of the pc532 specific development of NetBSD/pc532 was done on a +Most of the pc532 specific development of OpenBSD/pc532 was done on a machine with 8-Megs of memory. It should run with 4-Megs of memory although it may be slower. diff --git a/distrib/notes/pc532/install b/distrib/notes/pc532/install index f2b59b269c6..b4fb2082160 100644 --- a/distrib/notes/pc532/install +++ b/distrib/notes/pc532/install @@ -1,8 +1,8 @@ -(IF you already have NetBSD/pc532 installed and you only want to update +(IF you already have OpenBSD/pc532 installed and you only want to update your system, see the next section.) -To install NetBSD/pc532, there are several things you need to know. -First, NetBSD "autoconfigs" the scsi devices. inst-11.fs has only +To install OpenBSD/pc532, there are several things you need to know. +First, OpenBSD "autoconfigs" the scsi devices. inst-11.fs has only support for disks configured into the kernel. Starting the search at SCSI address 0, lun 0 and increasing, the first disk found will be sd0 regardless of the address, the second will be sd1. KLONDIKE for example @@ -54,7 +54,7 @@ The Install Procedure: drive and use the monitor's boot command to boot the default image from the floppy. The image booted will ask you for a kernel to load. Answer - sdXa:/netbsd + sdXa:/bsd Replace X with your drive number. For KLONDIKE X would be "2". Tape: @@ -62,7 +62,7 @@ The Install Procedure: - load the inst-11.fs at 0x288000 - run at 0x3E8820 The boot program will ask you now for a kernel to load. Answer - rd0a:/netbsd + rd0a:/bsd Serial line: Provided with the distribution is source for program called @@ -109,7 +109,7 @@ The Install Procedure: d) run "install" -- it will ask you for the disk geometry and other questions. It will ask you for the geometry and then ask you - how many of those sectors you want to use for NetBSD. It also + how many of those sectors you want to use for OpenBSD. It also wants to know the size of your boot partition (to be used with the auto-boot monitor), your root partition, your swap partition, and then any other partitions you may want. For the "other" @@ -120,11 +120,11 @@ The Install Procedure: to the mount point and it will not run newfs on the partition. It will enter the partition into the disklabel. - e) look around, if you want ... and then halt NetBSD. + e) look around, if you want ... and then halt OpenBSD. f) reboot the machine. Using the autoboot monitor, all you should have to do is give the ROM monitor command "boot". The secondary - UFS boot program eventually times out and auto-loads /netbsd. + UFS boot program eventually times out and auto-loads /bsd. You can get it to do it faster by hitting "return". If you are NOT using the autoboot monitor, it's time to warm up your eprom burner :-) @@ -145,7 +145,7 @@ The Install Procedure: c) tape - d) cdrom (If you have a CD with NetBSD/532 ...) + d) cdrom (If you have a CD with OpenBSD/532 ...) e) Use the ROM compatable "download" program. The program download is included in the initial installation and @@ -196,7 +196,7 @@ The Install Procedure: Now you can adjust the kernel's default baud rate to match your monitor's default baud rate. Do the following: - gdb -w /netbsd + gdb -w /bsd set scndefaultrate = YOUR_BAUD_RATE quit where YOUR_BAUD_RATE is the actual value, 19200, 38400 or @@ -208,5 +208,5 @@ The Install Procedure: l) Reboot the machine and it should come up in multi-user mode *IF* you got it configured correctly. - m) Enjoy! And help fix bugs and improve NetBSD/pc532! + m) Enjoy! And help fix bugs and improve OpenBSD/pc532! diff --git a/distrib/notes/pc532/upgrade b/distrib/notes/pc532/upgrade index 59a47726351..5d3c23e9424 100644 --- a/distrib/notes/pc532/upgrade +++ b/distrib/notes/pc532/upgrade @@ -1,16 +1,16 @@ -The upgrade to NetBSD 1.1 is a binary upgrade; it would be prohibitive +The upgrade to OpenBSD 1.1 is a binary upgrade; it would be prohibitive to make users upgrade by compiling and installing the 1.1 sources, and it would be very difficult to even compile a set of instructions that allowed them to do so. To do the upgrade, you must have at least base.tar.gz on disk and -a copy of the proper netbsd.default. It will require quite a bit +a copy of the proper bsd.default. It will require quite a bit of disk space to do the upgrade. Since upgrading involves replacing the kernel, and most of the system binaries, it has the potential to cause data loss. You are strongly advised to BACK UP ANY IMPORTANT DATA ON YOUR DISK, whether on the -NetBSD partition or on another operating system's partition, before +OpenBSD partition or on another operating system's partition, before beginning the upgrade process. To upgrade your system, follow the following instructions: @@ -29,14 +29,14 @@ To upgrade your system, follow the following instructions: Extract all the tar.gz files you want. You should carefully work at upgrading /etc. There may be changes to file formats - depending on what version of NetBSD/pc532 you are running. + depending on what version of OpenBSD/pc532 you are running. BE CAREFUL IF YOU ARE NOT RUNNING WITH SECURITY. The 1.1 distribution does contain support for password encription. It would be reasonable to save a copy of master.passwd and remove all passwords until after you upgrade. - Place netbsd.default in / as the file netbsd. + Place bsd.default in / as the file bsd. Reboot. (Remember, detbsd.default is a 9600 console line kernel. Read the last part of the new installation part of diff --git a/distrib/notes/pc532/xfer b/distrib/notes/pc532/xfer index 8333a1ce8ac..7120d3ea1df 100644 --- a/distrib/notes/pc532/xfer +++ b/distrib/notes/pc532/xfer @@ -1,4 +1,4 @@ -The "standard" method of getting NetBSD/pc532 onto your pc532 is +The "standard" method of getting OpenBSD/pc532 onto your pc532 is via the console terminal and using the downloading parts of the ROM monitor. As such, usually another computer has the distribution on disk and is connected via a serial line to your pc532's console @@ -10,12 +10,10 @@ sends data to the ROM monitor over the serial line. You may need to find and read the documentation about the ROM monitor download command and other low level comands. -Other methods of getting NetBSD/pc532 on your pc532 may include +Other methods of getting OpenBSD/pc532 on your pc532 may include SCSI tape or SCSI floppy disk or cloning a disk on a system -already running NetBSD/pc532. +already running OpenBSD/pc532. If you have some operating system already running on your pc532, -you can use that OS to get NetBSD/pc532 on a hard disk much easier than -with the ROM monitor. (NetBSD/pc532 was developed from Minix/pc532 -until it was self hosting. You can run NetBSD and Minix or other OS -off the same disk.) +you can use that OS to get OpenBSD/pc532 on a hard disk much easier than +with the ROM monitor. diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents index 8964dd047d8..f0086b18e34 100644 --- a/distrib/notes/sparc/contents +++ b/distrib/notes/sparc/contents @@ -1,8 +1,8 @@ -The sparc-specific portion of the NetBSD RELEASE release is found in the +The sparc-specific portion of the OpenBSD RELEASE release is found in the "sparc" subdirectory of the distribution. That subdirectory is laid out as follows: -.../NetBSD-RELEASE/sparc/ +.../OpenBSD-RELEASE/sparc/ binary/ sparc binary distribution sets; see below. @@ -12,21 +12,21 @@ out as follows: install/ Base GENERIC kernels, tools, and installation script. -The NetBSD/sparc binary distribution sets contain the binaries which -comprise the NetBSD RELEASE release for the sparc. There are seven binary +The OpenBSD/sparc binary distribution sets contain the binaries which +comprise the OpenBSD RELEASE release for the sparc. There are seven binary distribution sets, and the "security" distribution set. The binary distribution sets can be found in subdirectories of the "sparc/binary" -subdirectory of the NetBSD RELEASE distribution tree, and are as follows: +subdirectory of the OpenBSD RELEASE distribution tree, and are as follows: - base11 The NetBSD/sparc RELEASE base binary distribution. You + base11 The OpenBSD/sparc RELEASE base binary distribution. You MUST install this distribution set. It contains the - base NetBSD utilities that are necessary for the + base OpenBSD utilities that are necessary for the system to run and be minimally functional. It includes shared library support, and excludes everything described below. [ 8.0M gzipped, 24.4M uncompressed ] - comp11 The NetBSD/sparc Compiler tools. All of the tools + comp11 The OpenBSD/sparc Compiler tools. All of the tools relating to C, C++, and FORTRAN (yes, there are two!). This set includes the system include files (/usr/include), the linker, the compiler tool chain, @@ -61,16 +61,16 @@ subdirectory of the NetBSD RELEASE distribution tree, and are as follows: installed from the source tree by default. [ 1.9M gzipped, 6.6M uncompressed ] - text11 This set includes NetBSD's text processing tools, + text11 This set includes OpenBSD's text processing tools, including groff, all related programs, and their manual pages. [ 0.8M gzipped, 3.1M uncompressed ] The sparc security distribution set is named "secr11" and can be found -in the "sparc/security" subdirectory of the NetBSD RELEASE distribution +in the "sparc/security" subdirectory of the OpenBSD RELEASE distribution tree. It contains crypt.c (the source file for the DES encryption algorithm) and the binaries which depend on it. It can only be found -on those sites which carry the complete NetBSD distribution and that +on those sites which carry the complete OpenBSD distribution and that can legally obtain it. (Remember, because of United States law, this distribution set may not be exported to locations outside of the United States and Canada.) [ 127K gzipped, 337K uncompressed ] diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware index 0a360b8b81a..3be3fcb73ca 100644 --- a/distrib/notes/sparc/hardware +++ b/distrib/notes/sparc/hardware @@ -1,20 +1,20 @@ -NetBSD/sparc RELEASE runs on the following classes of machines: +OpenBSD/sparc RELEASE runs on the following classes of machines: - sun4c (e.g. the SS1, SS1+, SS2, IPC, ELC, IPX, and SLC) - sun4 (e.g. the 4/100, 4/200, and 4/300. note that support for the 4/400 processor is incomplete) -NetBSD/sparc RELEASE does *not* run on these machines (yet): +OpenBSD/sparc RELEASE does *not* run on these machines (yet): - sun-4/400 (lacking support for the I/O cache, and has ethernet problems) - sun4m (e.g. sparc classic, 4, 5, 10, and 20) - sun4d (e.g. sparc center 2000) -Work on porting NetBSD/sparc to the sun4m platform is currently in +Work on porting OpenBSD/sparc to the sun4m platform is currently in progress, but was not ready in time for the 1.1 release. The minimal configuration requires 4M of RAM and ~60M 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. (NetBSD with 4M of +X or compile the system, more RAM is recommended. (OpenBSD with 4M of RAM feels like Solaris with 4M of RAM.) Note that until you have around 16M of RAM, getting more RAM is more important than getting a faster CPU.) diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install index 95bf439d384..ca3f2496b1d 100644 --- a/distrib/notes/sparc/install +++ b/distrib/notes/sparc/install @@ -1,18 +1,18 @@ -Installing NetBSD is a relatively complex process, but if you have +Installing OpenBSD is a relatively complex process, but if you have this document in hand it shouldn't be too much trouble. -There are several ways to install NetBSD onto a disk. If your Sparcstation +There are several ways to install OpenBSD onto a disk. If your Sparcstation is hooked up in a network you can find find a server and arrange for a diskless setup which is a convenient way to install on a machine with a single disk attached. Alternatively, you could use SunOS (booted from -a local disk) and install NetBSD onto a second disk. For the latter method, +a local disk) and install OpenBSD onto a second disk. For the latter method, skip to the section "Installing from SunOS" below. Installing using a diskless setup. First, you must setup a diskless client configuration on a server. If -you are using a NetBSD system as the boot-server, have a look at the +you are using a OpenBSD system as the boot-server, have a look at the diskless(8) manual page for guidelines on how to proceed with this. If the server runs another operating system, you'll have to consult documentation that came with it (on SunOS systems, add_client(8) is a @@ -27,7 +27,7 @@ address 130.115.144.11, will make an TFTP request for `8273900B.SUN4C'. Normally, this file is symbolic link to an appropriate second-stage boot program, which should be located in a place where the TFTP daemon can find it (remember, many TFTP daemons run in a chroot'ed environment). -You can find the boot program in `/usr/mdec/boot' in the NetBSD/sparc +You can find the boot program in `/usr/mdec/boot' in the OpenBSD/sparc distribution. Unfortunately, it is necessary to install this file differently for sun4 and sun4c clients: the sun4 version needs to have its `a.out' header stripped off (otherwise the machine will crash), while the @@ -42,16 +42,16 @@ Here's an example to illustrate this whole mess: else server# set SKIP=0 server# set KARCH=SUN4C - server# dd if=boot of=/tftpboot/boot.sparc.netbsd.$KARCH skip=$SKIP bs=32 + server# dd if=boot of=/tftpboot/boot.sparc.bsd.$KARCH skip=$SKIP bs=32 server# cd /tftpboot - server# ln -s boot.sparc.netbsd.$KARCH 8273900B.$KARCH + server# ln -s boot.sparc.bsd.$KARCH 8273900B.$KARCH Note: some versions of Openboot ROMs (sun4c) seem to require that the boot program size is nicely rounded. Therefore it may be necessary to strip(8) off the symbol table. -As noted above in the section `Preparing your System for NetBSD Installation', +As noted above in the section `Preparing your System for OpenBSD Installation', you have several options when choosing a location to store the installation filesets. However, the easiest way is to put the *.tar.gz files you want to install into the root directory for your client on the server. @@ -61,7 +61,7 @@ directory for your machine. If you elect to use a separately NFS-mounted filesystem for `/usr' with your diskless setup, make sure the "./usr" base files in base.tar.gz end up in the correct location. One way to do this is to temporarily use a loopback mount on the server, re-routing <root>/usr to -your server's exported NetBSD "/usr" directory. Also put the kernel and the +your server's exported OpenBSD "/usr" directory. Also put the kernel and the install/upgrade scripts into the root directory. A few configuration files need to be edited: @@ -77,7 +77,7 @@ A few configuration files need to be edited: Enter the entries for the remotely mounted filesystems. For example: server:/export/root/client / nfs rw 0 0 - server:/export/exec/sun4.netbsd /usr nfs rw 0 0 + server:/export/exec/sun4.bsd /usr nfs rw 0 0 Now you must populate the the `/dev' directory for your client. If you server runs SunOS 4.x, you can simply change your working directory to `<root>/dev' @@ -85,19 +85,19 @@ and run the MAKEDEV script: `sh MAKEDEV all'. On SunOS 5.x systems, MAKEDEV can also be used, but there'll be error messages about unknown user and groups. These errors are inconsequential -for the purpose of installing NetBSD. However, you may want to correct them +for the purpose of installing OpenBSD. However, you may want to correct them if you plan to the diskless setup regularly. In that case, you may re-run -MAKEDEV on your NetBSD machine once it has booted. +MAKEDEV on your OpenBSD machine once it has booted. Boot your workstation from the server by entering the appropriate `boot' command at the monitor prompt. Depending on the PROM version in your machine, this command takes one of the following forms: - > b le()netbsd -s # for sun4 monitors - ok boot le()netbsd -s # for version 1 OpenBOOT ROMs - ok boot net netbsd -s # for version 2 OpenBOOT ROMs + > b le()bsd -s # for sun4 monitors + ok boot le()bsd -s # for version 1 OpenBOOT ROMs + ok boot net bsd -s # for version 2 OpenBOOT ROMs -This will boot the NetBSD kernel in single-user mode. +This will boot the OpenBSD kernel in single-user mode. [[ NOTE: the latter two examples assume you operate the OpenBOOT ROM in @@ -112,13 +112,13 @@ instead of `ok', type: If you use a diskless setup with a separately NFS-mounted /usr filesystem, mount /usr by hand now: -netbsd# mount /usr +openbsd# mount /usr At this point, it's worth checking the disk label and partition sizes on -the disk you want to install NetBSD onto. NetBSD understands SunOS-style +the disk you want to install OpenBSD onto. OpenBSD understands SunOS-style disklabels, so if your disk was previously used by SunOS there will be a usable label on it. Use `disklabel -e <disk>' (where <disk> is the -device name assigned by the NetBSD kernel, e.g. `sd0') to view and +device name assigned by the OpenBSD kernel, e.g. `sd0') to view and modify the partition sizes. A comfortable size for the root filesystem partition is about 20MB; a good initial size for the swap partition is twice the amount of physical memory in your machine (though, unlike @@ -128,7 +128,7 @@ takes about 60MB in `/usr'. Make all your partitions start and end on cylinder boundaries. NOTE: if you are installing on a SCSI disk that does *not* have a SunOS -or NetBSD label on it, you may still be able to use disklabel(8) but you'll +or OpenBSD label on it, you may still be able to use disklabel(8) but you'll have to create all partitions from scratch. If your disk is listed in `/etc/disktab', you may use the entry (which in most cases only defines a `c' partition to describe the whole disk) to put an initial label on @@ -156,7 +156,7 @@ the editor), then try setting it to `8 partitions:'. <BEGIN SAMPLE DISKLABEL SCREEN> -netbsd# disklabel sd2 +openbsd# disklabel sd2 # /dev/rsd2c: type: SCSI disk: SCSI disk @@ -184,13 +184,13 @@ drivedata: 0 <END SAMPLE DISKLABEL SCREEN> -If you are upgrading a NetBSD installation, start the upgrade script: +If you are upgrading a OpenBSD installation, start the upgrade script: -netbsd# sh upgrade.sh +openbsd# sh upgrade.sh else, start the installation script: -netbsd# sh install.sh +openbsd# sh install.sh These scripts will do most of the work of transferring the system from the @@ -204,42 +204,42 @@ have been identified by the kernel. The installation script goes through the following phases: - - determination of the disk to install NetBSD on + - determination of the disk to install OpenBSD on - checking of the partition information on the disk - - creating and mounting the NetBSD filesystems + - creating and mounting the OpenBSD filesystems - setup of IP configuration - extraction of the distribution tar files - installation of boot programs Now try a reboot. (If needed, swap your scsi id's first). Initially -I'd suggest you "boot sd()netbsd -bs", then try multiuser after that. -if you boot single-user the NetBSD incantation to make the root +I'd suggest you "boot sd()bsd -bs", then try multiuser after that. +if you boot single-user the OpenBSD incantation to make the root filesystem writable is - netbsd# mount -u /dev/sd0a / + openbsd# mount -u /dev/sd0a / The Sun monitor normally tries to load a file called "vmunix". On -OpenBOOT ROM systems you can change it to load NetBSD instead using +OpenBOOT ROM systems you can change it to load OpenBSD instead using the following commands: On version 1 OpenBOOT ROMs: >n - ok setenv boot-from sd(0,0,0)netbsd + ok setenv boot-from sd(0,0,0)bsd ok On version 2 OpenBOOT ROMs: - ok setenv boot-file netbsd + ok setenv boot-file bsd ok setenv boot-device /sbus/esp/sd@0,0 -Congratulations, you have successfully installed NetBSD RELEASE. When you -reboot into NetBSD, you should log in as "root" at the login prompt. +Congratulations, you have successfully installed OpenBSD RELEASE. When you +reboot into OpenBSD, you should log in as "root" at the login prompt. There is no initial password, but if you're using the machine in a networked environment, you should create yourself an account and protect it and the "root" account with good passwords. -Some of the files in the NetBSD RELEASE distribution might need to be +Some of the files in the OpenBSD RELEASE distribution might need to be tailored for your site. In particular, the /etc/sendmail.cf file will almost definitely need to be adjusted, and other files in /etc will probably need to be modified. If you are unfamiliar with UN*X-like @@ -250,7 +250,7 @@ discusses it. Installing from SunOS. -You need a SunOS machine to install NetBSD. You also need at +You need a SunOS machine to install OpenBSD. You also need at least the following pieces: the *.tar.gz files you want to install (as a minimum, base.tar.gz) @@ -259,13 +259,13 @@ least the following pieces: the "install.sh" script a "/boot" file from a SunOS machine that matches your machine type (e.g. sun or sun4c) - a kernel, most likely "/netbsd" + a kernel, most likely "/bsd" -All these pieces, except "/boot", are supplied in the NetBSD/sparc +All these pieces, except "/boot", are supplied in the OpenBSD/sparc distribution. You need to format and partition the disk using SunOS (since -NetBSD/sparc uses SunOS disk labels.) Give yourself adequate +OpenBSD/sparc uses SunOS disk labels.) Give yourself adequate partition sizes. Here is an example layout: partition size offset will be.. @@ -275,10 +275,10 @@ partition sizes. Here is an example layout: sd2g 160230 44310 /usr BTW, These are not recommended sizes. They simply match the first -(tiny) disk that NetBSD/sparc ran on. +(tiny) disk that OpenBSD/sparc ran on. Use SunOS to newfs the partitions which will have filesystems on them. -(NetBSD's filesystem format is identical to SunOS). +(OpenBSD's filesystem format is identical to SunOS). sunos# newfs /dev/rsd2a [... lots of output] @@ -286,7 +286,7 @@ Use SunOS to newfs the partitions which will have filesystems on them. [... lots of output] NOTE: If you are able to, there is a performance benefit from -newfs'ing using NetBSD. If you newfs using the NetBSD newfs command, +newfs'ing using OpenBSD. If you newfs using the OpenBSD newfs command, be sure to use the -O flag for your / partition, so that newfs will use the 4.3BSD filesystem format, rather than the new 4.4BSD filesystem format. If you forget, you will not be able to boot -- the SunOS boot @@ -313,7 +313,7 @@ provided script, "install_from_sunos.sh" will help you: sunos# ls -FC base.tar.gz etc.tar.gz man.tar.gz secr.tar.gz comp.tar.gz games.tar.gz misc.tar.gz text.tar.gz - install.sh netbsd.id3_scsi + install.sh bsd.id3_scsi sunos# ./install_from_sunos.sh [...] diff --git a/distrib/notes/sparc/prep b/distrib/notes/sparc/prep index c055fa624b8..8babd05a956 100644 --- a/distrib/notes/sparc/prep +++ b/distrib/notes/sparc/prep @@ -14,17 +14,17 @@ this table: 5 sd5 6 sd6 -Unlike SunOS and the OpenBOOT ROM, a generic NetBSD kernel numbers +Unlike SunOS and the OpenBOOT ROM, a generic OpenBSD kernel numbers scsi drives sequentially as it finds them. The drive with the lowest scsi-id will be called sd0, the next one sd1, etc. -To ease the installation process, the default NetBSD kernel in the +To ease the installation process, the default OpenBSD kernel in the distribution is setup to match the Sun mapping above by hard-wiring scsi-id#3 to sd0 and scsi-id#0 to sd3. The remaining drives will be dynamically mapped to other sd* numbers. -A truely generic NetBSD kernel is also provided as `/netbsd.GENERIC', -which will do the standard NetBSD probe ordering. If your configuration +A truely generic OpenBSD kernel is also provided as `/bsd.GENERIC', +which will do the standard OpenBSD probe ordering. If your configuration differs from the default Sun setup, you can try to use this kernel to complete the installation. @@ -40,7 +40,7 @@ instead of `ok', type: ok setenv sunmon-compat? false ok -This is needed because netbsd cannot handle the old-mode yet, and will +This is needed because OpenBSD cannot handle the old-mode yet, and will firework on you. Also, you cannot use the security modes of the sparc OpenBOOT ROM. diff --git a/distrib/notes/sparc/upgrade b/distrib/notes/sparc/upgrade index b8f5b80ae75..d5632bb7a63 100644 --- a/distrib/notes/sparc/upgrade +++ b/distrib/notes/sparc/upgrade @@ -1,5 +1,5 @@ -To upgrade to NetBSD 1.1 from a previous version follow the instructions -in the section "Installing NetBSD", but run the script `upgrade.sh' +To upgrade to OpenBSD 1.1 from a previous version follow the instructions +in the section "Installing OpenBSD", but run the script `upgrade.sh' in stead of `install.sh'. The upgrade script will use the existing disk partitions to install the diff --git a/distrib/notes/sparc/whatis b/distrib/notes/sparc/whatis index 28aadd5331f..a81aa25ea87 100644 --- a/distrib/notes/sparc/whatis +++ b/distrib/notes/sparc/whatis @@ -1,5 +1,5 @@ -NetBSD RELEASE is the second release for the sparc. Many more sparc +OpenBSD RELEASE is the second release for the sparc. Many more sparc models and devices are now supported. -In addition to the SunOS 4.1 compatibility present in NetBSD/sparc 1.0, +In addition to the SunOS 4.1 compatibility present in OpenBSD/sparc 1.0, version RELEASE will also run some number of SunOS 5 (SVR4) executables in binary emulation mode. diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer index 837731ed8b0..1e0c54398f1 100644 --- a/distrib/notes/sparc/xfer +++ b/distrib/notes/sparc/xfer @@ -9,11 +9,11 @@ you choose. The various methods are explained below. To prepare for installing via an NFS partition: - Since the current NetBSD/sparc installation program uses + Since the current OpenBSD/sparc installation program uses a diskless setup for your workstation, you will already have to prepare an NFS directory for use as a remote - root filesystem (see the section `Installing the NetBSD System' - below for details). The easiest way is to put the NetBSD filesets + root filesystem (see the section `Installing the OpenBSD System' + below for details). The easiest way is to put the OpenBSD filesets in this root filesystem on the server where the install program will find them. @@ -21,20 +21,20 @@ To prepare for installing via an NFS partition: another directory or even on another NFS server. To do so, follow these guide lines: - Place the NetBSD software you wish to install into + Place the OpenBSD software you wish to install into a directory on an NFS server, and make that directory mountable by the machine which you will be installing - NetBSD on. This will probably require modifying the + OpenBSD on. This will probably require modifying the /etc/exports file of the NFS server and resetting mountd, acts which will require superuser privileges. Note the numeric IP address of the NFS server and of - the router closest to the the new NetBSD machine, + the router closest to the the new OpenBSD machine, if the NFS server is not on a network which is - directly attached to the NetBSD machine. + directly attached to the OpenBSD machine. Once you have done this, you can proceed to the next step in the installation process, preparing your - system for NetBSD installation. + system for OpenBSD installation. To prepare for installing via FTP: @@ -48,19 +48,19 @@ To prepare for installing via FTP: The preparations for this method of installation are easy: all you have to do is make sure that there's some FTP site from which you can retrieve - the NetBSD installation when it's time to do + the OpenBSD installation when it's time to do the install. You should know the numeric IP address of that site, the numeric IP address of your nearest router if one is necessary Once you have done this, you can proceed to the next step in the installation process, preparing your - system for NetBSD installation. + system for OpenBSD installation. To prepare for installing via a tape: - To install NetBSD from a tape, you need to somehow - get the NetBSD filesets you wish to install on + To install OpenBSD from a tape, you need to somehow + get the OpenBSD filesets you wish to install on your system on to the appropriate kind of tape, in tar format. @@ -80,4 +80,4 @@ To prepare for installing via a tape: Once you have done this, you can proceed to the next step in the installation process, preparing your - system for NetBSD installation. + system for OpenBSD installation. diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents index 4074b02144b..21878bcc774 100644 --- a/distrib/notes/sun3/contents +++ b/distrib/notes/sun3/contents @@ -1,9 +1,9 @@ -The sun3-specific portion of the NetBSD 1.1 release is found in the +The sun3-specific portion of the OpenBSD 1.1 release is found in the "sun3" subdirectory of the distribution. That subdirectory is laid out as follows: -.../NetBSD-1.1/sun3/ +.../OpenBSD-1.1/sun3/ INSTALL.txt Installation notes; this file. install/ Boot programs, a GENERIC kernel, @@ -17,46 +17,46 @@ out as follows: security/ sun3 security distribution; see below. -The NetBSD/sun3 "install" distribution contains files that can be -used to install NetBSD onto a completely "bare" sun3. The files +The OpenBSD/sun3 "install" distribution contains files that can be +used to install OpenBSD onto a completely "bare" sun3. The files in the `.../install' directory are described below: miniroot.gz A gzipped copy of the miniroot filesystem. This image is to be un-gzipped and copied into the swap area of a disk. - netbsd-rd.gz A gzipped copy of the "RAMDISK kernel" + bsd-rd.gz A gzipped copy of the "RAMDISK kernel" for installing the miniroot filesystem. - netbsd-gen.gz A gzipped GENERIC kernel (for upgrade) + bsd-gen.gz A gzipped GENERIC kernel (for upgrade) netboot A copy of the network boot program. This is useful if you are installing - a diskless NetBSD/sun3 system. + a diskless OpenBSD/sun3 system. tapeboot A copy of the tape boot program, used as the first segment of a boot tape. These files can be used to make a boot tape suitable for installing -NetBSD/sun3. These files can also be used to configure an NFS server +OpenBSD/sun3. These files can also be used to configure an NFS server to support installation "over the network". See the section "Getting -the NetBSD System onto Useful Media" for instructions on either method. +the OpenBSD System onto Useful Media" for instructions on either method. -The NetBSD/sun3 binary distribution sets contain the binaries which -comprise the NetBSD 1.1 release for the sun3. There are seven binary +The OpenBSD/sun3 binary distribution sets contain the binaries which +comprise the OpenBSD 1.1 release for the sun3. There are seven binary distribution sets, and the "security" distribution set. The binary distribution sets can be found in the "sun3/binary" subdirectory of -the NetBSD 1.1 distribution tree, and are as follows: +the OpenBSD 1.1 distribution tree, and are as follows: - base11 The NetBSD/sun3 1.1 base binary distribution. You + base11 The OpenBSD/sun3 1.1 base binary distribution. You MUST install this distribution set. It contains the - base NetBSD utilities that are necessary for the + base OpenBSD utilities that are necessary for the system to run and be minimally functional. It includes shared library support, and excludes everything described below. [ 7.2M gzipped, 19M uncompressed ] - comp11 The NetBSD/sun3 Compiler tools. All of the tools + comp11 The OpenBSD/sun3 Compiler tools. All of the tools relating to C and C++. This set includes the system include files (/usr/include), the linker, the compiler tool chain, and the various system libraries (except @@ -90,16 +90,16 @@ the NetBSD 1.1 distribution tree, and are as follows: installed from the source tree by default. [ 1.8M gzipped, 6.5M uncompressed ] - text11 This set includes NetBSD's text processing tools, + text11 This set includes OpenBSD's text processing tools, including groff, all related programs, and their manual pages. [ 770K gzipped, 2.8M uncompressed ] The sun3 security distribution set is named "secr11" and can be found -in the "sun3/security" subdirectory of the NetBSD 1.1 distribution +in the "sun3/security" subdirectory of the OpenBSD 1.1 distribution tree. It contains executables which are built in the "src/domestic" portion -if the NetBSD source tree. It can only be found on those sites which carry -the complete NetBSD distribution and that can legally obtain it. (Remember, +if the OpenBSD source tree. It can only be found on those sites which carry +the complete OpenBSD distribution and that can legally obtain it. (Remember, because of United States law, this distribution set may not be exported to locations outside of the United States and Canada.) [ 128K gzipped, 275K uncompressed ] diff --git a/distrib/notes/sun3/hardware b/distrib/notes/sun3/hardware index f0a267597ea..d8216e4a82d 100644 --- a/distrib/notes/sun3/hardware +++ b/distrib/notes/sun3/hardware @@ -1,10 +1,10 @@ -NetBSD/sun3 1.1 runs on most Sun3 machines, including: +OpenBSD/sun3 1.1 runs on most Sun3 machines, including: 3/50, 3/60, 3/110 3/75, 3/150, 3/160 3/260, 3/280 -NetBSD/sun3 1.1 does not run on the Sun3/80 (sun3x class) +OpenBSD/sun3 1.1 does not run on the Sun3/80 (sun3x class) because the sun3x MMU and other devices are very different. The minimal configuration requires 4M of RAM and ~80MB of disk space. diff --git a/distrib/notes/sun3/install b/distrib/notes/sun3/install index 43446d32071..ba3cf7f56d3 100644 --- a/distrib/notes/sun3/install +++ b/distrib/notes/sun3/install @@ -1,8 +1,8 @@ -Installing NetBSD is a relatively complex process, but if you have +Installing OpenBSD is a relatively complex process, but if you have this document in hand it should not be too difficult. -There are several ways to install NetBSD onto your disk. If your +There are several ways to install OpenBSD onto your disk. If your machine has a tape drive the easiest way is "Installing from tape" (details below). If your machine is on a network with a suitable NFS server, then "Installing from NFS" is the next best method. @@ -13,7 +13,7 @@ initialize the disk on that machine and then move the disk. * Installing from tape: -Create the NetBSD/sun3 1.1 boot tape as described in the section +Create the OpenBSD/sun3 1.1 boot tape as described in the section entitled "Preparing a boot tape" and boot the tape. At the PROM monitor prompt, use one of the commands: >b st() @@ -24,7 +24,7 @@ second will use SCSI target 5. The '>' is the monitor prompt. After the tape loads, you should see many lines of configuration messages, and then the following "welcome" screen: - Welcome to the NetBSD/sun3 RAMDISK root! + Welcome to the OpenBSD/sun3 RAMDISK root! This environment is designed to do only three things: 1: Partititon your disk (use the command: edlabel /dev/rsd0c) @@ -59,7 +59,7 @@ entitled "Booting the miniroot" for details. Before you can install from NFS, you must have already configured your NFS server to support your machine as a diskless client. Instructions for configuring the server are found in the section -entitled "Getting the NetBSD System onto Useful Media" above. +entitled "Getting the OpenBSD System onto Useful Media" above. First, at the Sun PROM monitor prompt, enter a boot command using the network interface as the boot device. On desktop diff --git a/distrib/notes/sun3/prep b/distrib/notes/sun3/prep index e2ed99197ea..d5603deae5f 100644 --- a/distrib/notes/sun3/prep +++ b/distrib/notes/sun3/prep @@ -1,10 +1,10 @@ Sun3 machines usually need little or no preparation before installing -NetBSD, other than the usual, well advised precaution of BACKING UP +OpenBSD, other than the usual, well advised precaution of BACKING UP ALL DATA on any attached storage devices. You will need to know the SCSI target ID of the drive on which you -will install NetBSD. Note that SunOS/sun3 uses confusing names for +will install OpenBSD. Note that SunOS/sun3 uses confusing names for the SCSI devcies: target 1 is sd2, target 2 is sd4, etc. It might be a good time to run the diagnostics on your Sun3. First, @@ -21,5 +21,5 @@ just a '.' if you don't want to change it). Console values are: 11: tty b (1200-N-8-1) 20: Color option board on P4 -NetBSD will use the EEPROM setting to determine which device to +OpenBSD will use the EEPROM setting to determine which device to use as the console, so you should make sure it is correct. diff --git a/distrib/notes/sun3/upgrade b/distrib/notes/sun3/upgrade index 03413985f35..9cbec98dfad 100644 --- a/distrib/notes/sun3/upgrade +++ b/distrib/notes/sun3/upgrade @@ -8,7 +8,7 @@ Manual upgrade procedure: * Place _at least_ the `base' binary set in a filesystem accessible to the target machine. A local filesystem is preferred, since there may be incompatibilities - between the NetBSD 1.1 kernel and older route(8) + between the OpenBSD 1.1 kernel and older route(8) binaries. * Back up your pre-existing kernel and copy the 1.1 @@ -31,7 +31,7 @@ Manual upgrade procedure: sh /etc/netstart NOTE: the route(8) commands may fail due to potential - incompatibilities between route(8) and the NetBSD 1.1 + incompatibilities between route(8) and the OpenBSD 1.1 kernel. Once you have enabled the network, mount the NFS filesystems. If you use amd(8), you may or may not have to mount these filesystems manually. Your mileage diff --git a/distrib/notes/sun3/whatis b/distrib/notes/sun3/whatis index 6c55986da91..7230a9498a0 100644 --- a/distrib/notes/sun3/whatis +++ b/distrib/notes/sun3/whatis @@ -1,7 +1,7 @@ -NetBSD 1.1 is the first "full" release of NetBSD for the sun3, +OpenBSD 1.1 is the first "full" release of OpenBSD for the sun3, including a full set of binaries. This binary distribution is -referred to elsewhere in this document by the name NetBSD/sun3. +referred to elsewhere in this document by the name OpenBSD/sun3. This release offers improved stability and many new features. New features added since the 1.0 release include: diff --git a/distrib/notes/sun3/xfer b/distrib/notes/sun3/xfer index c6fdf1ad225..79b25b4d9a4 100644 --- a/distrib/notes/sun3/xfer +++ b/distrib/notes/sun3/xfer @@ -14,8 +14,8 @@ for each type of media are given below. In order to create installation media, you will need all the files in these two directories: - .../NetBSD-1.1/sun3/install - .../NetBSD-1-1/sun3/binary + .../OpenBSD-1.1/sun3/install + .../OpenBSD-1-1/sun3/binary * Creating boot/install tapes: @@ -25,17 +25,17 @@ tape, and another called the "install" tape. The boot tape is created as follows: - cd .../NetBSD-1.1/sun3/install + cd .../OpenBSD-1.1/sun3/install set T = /dev/nrst0 mt -f $T rewind dd if=tapeboot of=$T bs=8k conv=sync - dd if=netbsd-rd of=$T bs=8k conv=sync + dd if=bsd-rd of=$T bs=8k conv=sync gzip -d < miniroot.gz | dd of=$T bs=8k mt -f $T rewind The install tape is created as follows: - cd .../NetBSD-1.1/sun3/install + cd .../OpenBSD-1.1/sun3/install set T = /dev/nrst0 mt -f $T rewind foreach f (base etc comp games man misc text) @@ -53,14 +53,14 @@ created for more details. * Boot/Install from NFS server: If your machine has a disk and network connection, but no tape drive, -it may be convenient for you to install NetBSD over the network. This +it may be convenient for you to install OpenBSD over the network. This involves temporarily booting your machine over NFS, just long enough so you can initialize its disk. This method requires that you have access to an NFS server on your network so you can configure it to support diskless boot for your machine. Configuring the NFS server is normally a task for a system administrator, and is not trivial. -If you are using a NetBSD system as the boot-server, have a look at +If you are using a OpenBSD system as the boot-server, have a look at the diskless(8) manual page for guidelines on how to proceed with this. If the server runs another operating system, consult the documentation that came with it (i.e. add_client(8) on SunOS). @@ -71,7 +71,7 @@ when instructed to boot "over the net". It will look for a filename derived from the machine's IP address expressed in hexadecimal. For example, a sun3 which has been assigned IP address 130.115.144.11 will make an TFTP request for `8273900B'. Normally, this file is a -symbolic link to the NetBSD/sun3 "netboot" program, which should be +symbolic link to the OpenBSD/sun3 "netboot" program, which should be located in a place where the TFTP daemon can find it (remember, many TFTP daemons run in a chroot'ed environment). The netboot program may be found in the install directory of this distribution. @@ -79,7 +79,7 @@ may be found in the install directory of this distribution. The netboot program will query a bootparamd server to find the NFS server address and path name for its root, and then load a kernel from that location. The server should have a copy of the -netbsd-rd kernel in the root area for your client (no other files +bsd-rd kernel in the root area for your client (no other files are needed in the client root) and /etc/bootparams on the server should have an entry for your client and its root directory. The client will need access to the miniroot image, which can be @@ -87,9 +87,9 @@ provided using NFS or remote shell. If using NFS, miniroot.gz must be expanded on the server, because there is no gzip program in the RAMDISK image. The unzipped miniroot takes 8MB of space. -If you will be installing NetBSD on several clients, it may be useful +If you will be installing OpenBSD on several clients, it may be useful to know that you can use a single NFS root for all the clients as long -as they only use the netbsd-rd kernel. There will be no conflict +as they only use the bsd-rd kernel. There will be no conflict between clients because the RAM-disk kernel will not use the NFS root. No swap file is needed; the RAM-disk kernel does not use that either. @@ -98,7 +98,7 @@ No swap file is needed; the RAM-disk kernel does not use that either. This method requires that you boot from another device (i.e. tape or network, as described above). You may need to make a boot tape on another machine using the files provided on the CD-ROM. Once -you have booted netbsd-rd (the RAM-disk kernel) and loaded the +you have booted bsd-rd (the RAM-disk kernel) and loaded the miniroot, you can load any of the distribution sets directly from the CD-ROM. The "install" program in the miniroot automates the work required to mount the CD-ROM and extract the files. @@ -108,18 +108,18 @@ work required to mount the CD-ROM and extract the files. This method requires that you boot from another device (i.e. tape or network, as described above). You may need to make a boot tape on another machine using the files in .../install (which you get -via FTP). Once you have booted netbsd-rd (the RAM-disk kernel) +via FTP). Once you have booted bsd-rd (the RAM-disk kernel) and loaded the miniroot, you can load any of the distribution sets over the net using FTP. The "install" program in the miniroot automates the work required to configure the network interface and transfer the files. This method, of course, requires network access to an FTP server. -This might be a local system, or it might even be ftp.NetBSD.ORG -itself. If you wish to use ftp.NetBSD.ORG as your FTP file +This might be a local system, or it might even be ftp.OpenBSD.ORG +itself. If you wish to use ftp.OpenBSD.ORG as your FTP file server, you may want to keep the following information handy: - IP Address: 205.149.163.23 + IP Address: 128.6.190.2 Login: anonymous Password: <your e-mail address> - Server path: /pub/NetBSD/NetBSD-1.1/sun3/binary + Server path: /pub/OpenBSD/OpenBSD-1.1/sun3/binary diff --git a/distrib/pc532/floppies/inst-common/Makefile.inc b/distrib/pc532/floppies/inst-common/Makefile.inc index c928729ee6a..8d4a508b1ec 100644 --- a/distrib/pc532/floppies/inst-common/Makefile.inc +++ b/distrib/pc532/floppies/inst-common/Makefile.inc @@ -1,3 +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 $ # TOP is assumed to be defined by Makefile including this one. @@ -23,7 +24,7 @@ PWDOBJ= ${PWDSRC}/obj PWDOBJ= ${PWDSRC} .endif -all: netbsd +all: bsd 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" \ @@ -31,13 +32,13 @@ all: netbsd 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 netbsd ${MOUNT_POINT}/netbsd + cp bsd ${MOUNT_POINT}/bsd @df -i ${MOUNT_POINT} @echo "" umount ${MOUNT_POINT} vnconfig -u ${VND_DEV} -inject.fs: ${CBIN} ${LISTS} netbsd.gz +inject.fs: ${CBIN} ${LISTS} bsd.gz (cd ${PWDSRC}; ${MAKE}) ${CC} -static -o pwd_mkdb ${PWDOBJ}/*.o dd if=/dev/zero of=${.TARGET} bs=128k count=16 @@ -69,29 +70,29 @@ cloak: ${COMMONDIR}/cloak.c inject: ${COMMONDIR}/inject.c -netbsd.gz: - gzip -9 <${ADIR}/compile/DEFAULT/netbsd >netbsd.gz -# cp ${ADIR}/compile/DEFAULT/netbsd /var/tmp/$$$$; \ +bsd.gz: + gzip -9 <${ADIR}/compile/DEFAULT/bsd >bsd.gz +# cp ${ADIR}/compile/DEFAULT/bsd /var/tmp/$$$$; \ # strip /var/tmp/$$$$; \ -# gzip -9 </var/tmp/$$$$ >netbsd.gz; \ +# gzip -9 </var/tmp/$$$$ >bsd.gz; \ # rm /var/tmp/$$$$ -netbsd.o: inject cloak inject.fs - cp ${ADIR}/compile/INSTALL/netbsd /var/tmp/$$$$; \ +bsd.o: inject cloak inject.fs + cp ${ADIR}/compile/INSTALL/bsd /var/tmp/$$$$; \ strip /var/tmp/$$$$; \ ./inject /var/tmp/$$$$ inject.fs; \ - gzip -9 </var/tmp/$$$$ | ./cloak >netbsd.o; \ + gzip -9 </var/tmp/$$$$ | ./cloak >bsd.o; \ rm /var/tmp/$$$$ go.o: ${COMMONDIR}/go.c -netbsd: netbsd.o go.o - ld -s -z -T 240000 -e _go go.o netbsd.o ${MDEC}/zboot.o -o netbsd +bsd: bsd.o go.o + ld -s -z -T 240000 -e _go go.o netbsd.o ${MDEC}/zboot.o -o bsd clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c - /bin/rm -f netbsd* inject* cloak pwd_mkdb + /bin/rm -f bsd* inject* cloak pwd_mkdb .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/pc532/floppies/inst-common/dot.commonutils b/distrib/pc532/floppies/inst-common/dot.commonutils index a20c781f80a..c177aa9318e 100644 --- a/distrib/pc532/floppies/inst-common/dot.commonutils +++ b/distrib/pc532/floppies/inst-common/dot.commonutils @@ -1,3 +1,4 @@ +# $OpenBSD: dot.commonutils,v 1.4 1996/04/25 21:30:35 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:35 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/pc532/floppies/inst-common/download.c b/distrib/pc532/floppies/inst-common/download.c index 35081488753..77ce907136b 100644 --- a/distrib/pc532/floppies/inst-common/download.c +++ b/distrib/pc532/floppies/inst-common/download.c @@ -1,13 +1,14 @@ +/* $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 NetBSD, 10/5/95. + Hacked by Phil Nelson for use with OpenBSD, 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 NetBSD, the usages are: + For OpenBSD, 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 ecee0b7233b..43be4735473 100644 --- a/distrib/pc532/floppies/inst-common/go.c +++ b/distrib/pc532/floppies/inst-common/go.c @@ -1,3 +1,5 @@ +/* $OpenBSD: go.c,v 1.2 1996/04/25 21:30:41 niklas Exp $ */ + /* * Copyright (c) 1995 Matthias Pfaller. * All rights reserved. @@ -26,19 +28,17 @@ * 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.1 1995/10/18 08:37:42 deraadt Exp $ */ #include <sys/reboot.h> register r6 asm("r6"); /* - * 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. + * 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. */ go() diff --git a/distrib/pc532/floppies/inst-common/list b/distrib/pc532/floppies/inst-common/list index 1ac29a41cd6..ae2ef0179b6 100644 --- a/distrib/pc532/floppies/inst-common/list +++ b/distrib/pc532/floppies/inst-common/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.3 1995/12/14 07:00:36 deraadt Exp $ +# $OpenBSD: list,v 1.4 1996/04/25 21:30:44 niklas 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}/netbsd.gz netbsd.gz +COPY ${OBJDIR}/bsd.gz bsd.gz COPY ${OBJDIR}/instbin instbin LINK instbin bin/cat LINK instbin bin/chmod diff --git a/distrib/pc532/floppies/inst-common/memory_map b/distrib/pc532/floppies/inst-common/memory_map index 2017799dfd7..a694259dbd3 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 netbsd image (may overflow into rd0 image) -0x002000 Start of kernel (may overflow into netbsd image) +0x240000 Start of bsd image (may overflow into rd0 image) +0x002000 Start of kernel (may overflow into bsd image) diff --git a/distrib/pc532/floppies/inst/dot.hdprofile b/distrib/pc532/floppies/inst/dot.hdprofile index 82e5f5ef570..ecbb469f077 100644 --- a/distrib/pc532/floppies/inst/dot.hdprofile +++ b/distrib/pc532/floppies/inst/dot.hdprofile @@ -1,3 +1,4 @@ +# $OpenBSD: dot.hdprofile,v 1.2 1996/04/25 21:30:26 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.1 1995/10/18 08:37:43 deraadt Exp $ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/usr/games:/ export PATH @@ -57,6 +56,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/pc532/floppies/inst/dot.instutils b/distrib/pc532/floppies/inst/dot.instutils index 7fbc8927ac5..57d8d75fab5 100644 --- a/distrib/pc532/floppies/inst/dot.instutils +++ b/distrib/pc532/floppies/inst/dot.instutils @@ -1,3 +1,4 @@ +# $OpenBSD: dot.instutils,v 1.2 1996/04/25 21:30:28 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:43 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/pc532/floppies/inst/install.sh b/distrib/pc532/floppies/inst/install.sh index b583a543e1a..0a829b1c7e0 100644 --- a/distrib/pc532/floppies/inst/install.sh +++ b/distrib/pc532/floppies/inst/install.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: install.sh,v 1.4 1996/04/25 21:30:29 niklas Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -26,10 +27,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.3 1995/12/14 07:00:32 deraadt Exp $ -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. @@ -47,9 +46,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." @@ -133,7 +132,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 -n "Number of bytes per disk sector? [512] " @@ -230,7 +229,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 @@ -251,7 +250,7 @@ echo "" boot=0 while [ $boot -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 "Boot partition size (in $sizeunit)? " getresp case $resp in @@ -274,7 +273,7 @@ blocksize=8192 $DONTDOIT mount -u /dev/rd0 / 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 @@ -294,8 +293,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 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 @@ -303,7 +302,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 @@ -363,7 +362,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 @@ -435,7 +434,7 @@ echo "" echo "Populating filesystems with bootstrapping binaries and config files" $DONTDOIT tar --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - ) $DONTDOIT cp /tmp/.hdprofile /mnt/.profile -$DONTDOIT gzip -d /mnt/netbsd.gz +$DONTDOIT gzip -d /mnt/bsd.gz echo "" echo -n "Creating an fstab..." @@ -465,7 +464,7 @@ echo "You can now boot off the hard drive." echo "" echo "The remaining tasks are:" 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/pc532/floppies/upgr/dot.hdprofile b/distrib/pc532/floppies/upgr/dot.hdprofile index 0a692babcee..c516921d862 100644 --- a/distrib/pc532/floppies/upgr/dot.hdprofile +++ b/distrib/pc532/floppies/upgr/dot.hdprofile @@ -1,3 +1,4 @@ +# $OpenBSD: dot.hdprofile,v 1.2 1996/04/25 21:30:52 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.1 1995/10/18 08:37: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/pc532/floppies/upgr/dot.upgrutils b/distrib/pc532/floppies/upgr/dot.upgrutils index 96a7f92639e..f3b614ad163 100644 --- a/distrib/pc532/floppies/upgr/dot.upgrutils +++ b/distrib/pc532/floppies/upgr/dot.upgrutils @@ -1,3 +1,4 @@ +# $OpenBSD: dot.upgrutils,v 1.2 1996/04/25 21:30:56 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.1 1995/10/18 08:37:43 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() { @@ -49,7 +48,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/pc532/floppies/upgr/upgrade.sh b/distrib/pc532/floppies/upgr/upgrade.sh index 0d8bd1f12eb..5fc83836b9a 100644 --- a/distrib/pc532/floppies/upgr/upgrade.sh +++ b/distrib/pc532/floppies/upgr/upgrade.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: upgrade.sh,v 1.2 1996/04/25 21:30:59 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.1 1995/10/18 08:37:44 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!" diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index c0cb2dabcb3..f70d5027b3d 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -611,7 +611,7 @@ ./usr/share/games/larn ./usr/share/games/quiz.db ./usr/share/gnats -./usr/share/gnats/netbsd +./usr/share/gnats/bsd ./usr/share/groff_font ./usr/share/groff_font/devX100 ./usr/share/groff_font/devX100-12 diff --git a/distrib/sparc/floppies/inst-common/dot.commonutils b/distrib/sparc/floppies/inst-common/dot.commonutils index ec71cb22b1e..aaa436bf92a 100644 --- a/distrib/sparc/floppies/inst-common/dot.commonutils +++ b/distrib/sparc/floppies/inst-common/dot.commonutils @@ -1,3 +1,4 @@ +# $OpenBSD: dot.commonutils,v 1.2 1996/04/25 21:31:24 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.1 1995/10/27 22:39:53 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/sparc/floppies/inst/dot.hdprofile b/distrib/sparc/floppies/inst/dot.hdprofile index f434c09abdd..20ef27690dc 100644 --- a/distrib/sparc/floppies/inst/dot.hdprofile +++ b/distrib/sparc/floppies/inst/dot.hdprofile @@ -1,3 +1,4 @@ +# $OpenBSD: dot.hdprofile,v 1.2 1996/04/25 21:31:12 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.1 1995/10/27 22:39:43 deraadt Exp $ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH @@ -57,6 +56,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/sparc/floppies/inst/dot.instutils b/distrib/sparc/floppies/inst/dot.instutils index af22d774eff..496c10f1726 100644 --- a/distrib/sparc/floppies/inst/dot.instutils +++ b/distrib/sparc/floppies/inst/dot.instutils @@ -1,3 +1,4 @@ +# $OpenBSD: dot.instutils,v 1.2 1996/04/25 21:31:16 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/27 22:39:44 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/sparc/floppies/inst/install.sh b/distrib/sparc/floppies/inst/install.sh index d450174c3de..4142d3b6042 100644 --- a/distrib/sparc/floppies/inst/install.sh +++ b/distrib/sparc/floppies/inst/install.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: install.sh,v 1.2 1996/04/25 21:31:19 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.1 1995/10/27 22:39:49 deraadt 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 -n "Number of bytes per disk sector? [512] " @@ -215,13 +214,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 @@ -264,7 +263,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 @@ -287,7 +286,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 @@ -304,8 +303,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 @@ -313,7 +312,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 @@ -373,7 +372,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 @@ -469,10 +468,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/sparc/floppies/upgr/dot.hdprofile b/distrib/sparc/floppies/upgr/dot.hdprofile index ff95d52f681..56d216c8223 100644 --- a/distrib/sparc/floppies/upgr/dot.hdprofile +++ b/distrib/sparc/floppies/upgr/dot.hdprofile @@ -1,3 +1,4 @@ +# $OpenBSD: dot.hdprofile,v 1.2 1996/04/25 21:31:29 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.1 1995/10/27 22:40:05 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/sparc/floppies/upgr/dot.upgrutils b/distrib/sparc/floppies/upgr/dot.upgrutils index efde5d1f067..06b93eabc42 100644 --- a/distrib/sparc/floppies/upgr/dot.upgrutils +++ b/distrib/sparc/floppies/upgr/dot.upgrutils @@ -1,3 +1,4 @@ +# $OpenBSD: dot.upgrutils,v 1.2 1996/04/25 21:31:32 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.1 1995/10/27 22:40:07 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() { @@ -49,7 +48,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/sparc/floppies/upgr/upgrade.sh b/distrib/sparc/floppies/upgr/upgrade.sh index 03a8ef12b29..c4a0071fde4 100644 --- a/distrib/sparc/floppies/upgr/upgrade.sh +++ b/distrib/sparc/floppies/upgr/upgrade.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: upgrade.sh,v 1.2 1996/04/25 21:31:35 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.1 1995/10/27 22:40:09 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!" diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list index 9bbea26cec1..b9247aae2c9 100644 --- a/distrib/sparc/miniroot/list +++ b/distrib/sparc/miniroot/list @@ -1,3 +1,4 @@ +# $OpenBSD: list,v 1.3 1996/04/25 21:31:40 niklas Exp $ # $NetBSD: list,v 1.2 1996/01/06 22:42:17 pk Exp $ # We can only get this program this way. @@ -8,7 +9,7 @@ SPECIAL chmod 555 sbin/mount_mfs COPYDIR ${DESTDIR}/usr/mdec usr/mdec # copy the kernel -COPY ${CURDIR}/../../sys/arch/sparc/compile/GENERIC/netbsd netbsd +COPY ${CURDIR}/../../sys/arch/sparc/compile/GENERIC/bsd bsd # various files that we need in /etc for the install COPY ${DESTDIR}/etc/disktab etc/disktab.shadow diff --git a/distrib/sun3/common/mr.profile b/distrib/sun3/common/mr.profile index 52b23f6a79c..e99ca75fa85 100644 --- a/distrib/sun3/common/mr.profile +++ b/distrib/sun3/common/mr.profile @@ -1,4 +1,4 @@ -# +# $OpenBSD: mr.profile,v 1.3 1996/04/25 21:31:46 niklas Exp $ # $NetBSD: mr.profile,v 1.2 1995/11/21 21:19:08 gwr Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -52,7 +52,7 @@ update sh /.remount # run the installation script. -echo 'To install NetBSD, enter the command: install' +echo 'To install OpenBSD, enter the command: install' echo 'Otherwise, enter the command: halt' # /install XXX - Not yet... diff --git a/distrib/sun3/common/rd.passwd b/distrib/sun3/common/rd.passwd index b524734954a..9e1644a7235 100644 --- a/distrib/sun3/common/rd.passwd +++ b/distrib/sun3/common/rd.passwd @@ -1 +1 @@ -root::0:0:NetBSD RAM-disk root:/root:/bin/sh +root::0:0:OpenBSD RAM-disk root:/root:/bin/sh diff --git a/distrib/sun3/common/rd.welcome b/distrib/sun3/common/rd.welcome index 9c1cf8fa3b2..4888456008a 100644 --- a/distrib/sun3/common/rd.welcome +++ b/distrib/sun3/common/rd.welcome @@ -1,5 +1,5 @@ - Welcome to the NetBSD/sun3 RAMDISK root! + Welcome to the OpenBSD/sun3 RAMDISK root! This environment is designed to do only three things: 1: Partititon your disk (use the command: edlabel /dev/rsd0c) diff --git a/distrib/sun3/miniroot/Makefile b/distrib/sun3/miniroot/Makefile index 9e22b7ca78c..6965289b2f9 100644 --- a/distrib/sun3/miniroot/Makefile +++ b/distrib/sun3/miniroot/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.3 1996/04/25 21:31:56 niklas Exp $ # $NetBSD: Makefile,v 1.3 1995/11/21 21:19:12 gwr Exp $ TOP= ${.CURDIR}/.. @@ -16,7 +17,7 @@ LISTS= ${TOP}/common/mini_sbin.list \ ${TOP}/common/mini_xx.list \ ${TOP}/common/${IMAGE}.list -KERNEL=${SRCSYSDIR}/arch/sun3/compile/GENERIC/netbsd +KERNEL=${SRCSYSDIR}/arch/sun3/compile/GENERIC/bsd MOUNT_POINT= /mnt #BDEV= /dev/sd2b @@ -42,7 +43,7 @@ ${IMAGE}.gz: ${TREE} ${LISTS} ${CBIN} mini_xx sync ; sleep 1 ; sync cd ${MOUNT_POINT} ;\ usr/mdec/installboot -v ufsboot usr/mdec/bootxx ${CDEV} - cp ${KERNEL} ${MOUNT_POINT}/netbsd + cp ${KERNEL} ${MOUNT_POINT}/bsd sync @echo "" @df -i ${MOUNT_POINT} diff --git a/distrib/sun3/ramdisk/Makefile b/distrib/sun3/ramdisk/Makefile index 278e1c30042..dd40cc3b6be 100644 --- a/distrib/sun3/ramdisk/Makefile +++ b/distrib/sun3/ramdisk/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.3 1996/04/25 21:32:01 niklas Exp $ # $NetBSD: Makefile,v 1.3 1995/11/21 21:19:14 gwr Exp $ TOP= ${.CURDIR}/.. @@ -13,7 +14,7 @@ TREE= ${TOP}/common/${IMAGE}.tree LISTS= ${TOP}/common/${CBIN}.list \ ${TOP}/common/${IMAGE}.list -KERNEL=${SRCSYSDIR}/arch/sun3/compile/RAMDISK/netbsd +KERNEL=${SRCSYSDIR}/arch/sun3/compile/RAMDISK/bsd MOUNT_POINT= /mnt BDEV= /dev/rd0 @@ -25,12 +26,12 @@ NBLKS= 512 # old format, minfree, opt, b/i trks, sects, cpg NEWFSARGS= -O -m 0 -o space -i 2048 -t 2 -u 16 -c 16 -CLEANFILES= netbsd-rd rdsetroot ${IMAGE}.fs +CLEANFILES= bsd-rd rdsetroot ${IMAGE}.fs -netbsd-rd : rdsetroot ${IMAGE}.fs - cp ${KERNEL} netbsd-tmp - ./rdsetroot netbsd-tmp < ${IMAGE}.fs - -mv -f netbsd-tmp $@ +bsd-rd : rdsetroot ${IMAGE}.fs + cp ${KERNEL} bsd-tmp + ./rdsetroot bsd-tmp < ${IMAGE}.fs + -mv -f bsd-tmp $@ rdsetroot: ${TOP}/common/rdsetroot.c $(CC) -o $@ -DDEBUG ${TOP}/common/rdsetroot.c diff --git a/distrib/vax/inst-common/dot.commonutils b/distrib/vax/inst-common/dot.commonutils index 53ca17fc97c..8cb5351cdbe 100644 --- a/distrib/vax/inst-common/dot.commonutils +++ b/distrib/vax/inst-common/dot.commonutils @@ -1,3 +1,4 @@ +# $OpenBSD: dot.commonutils,v 1.2 1996/04/25 21:32: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.1 1995/10/18 08:37:54 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. Set_tmp_dir() { diff --git a/distrib/vax/inst-common/list b/distrib/vax/inst-common/list index 6f9a778ef5d..55f73a9c528 100644 --- a/distrib/vax/inst-common/list +++ b/distrib/vax/inst-common/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.1 1995/10/18 08:37:54 deraadt Exp $ +# $OpenBSD: list,v 1.2 1996/04/25 21:32:16 niklas Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -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 /gennetbsd . +COPY /genbsd . COPY /boot . diff --git a/distrib/vax/inst/dot.profile b/distrib/vax/inst/dot.profile index a4bd1fdfa81..dad9cb83389 100644 --- a/distrib/vax/inst/dot.profile +++ b/distrib/vax/inst/dot.profile @@ -1,3 +1,5 @@ +# $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 @@ -5,10 +7,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 NetBSD is booted you're on your own." +echo "Now when OpenBSD 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 /gennetbsd and /boot to the" +echo "Also remember to copy /genbsd and /boot to the" echo "new root; it's not there by default." echo echo "Good luck!" |