summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/notes/INSTALL14
-rw-r--r--distrib/notes/alpha/contents22
-rw-r--r--distrib/notes/alpha/hardware2
-rw-r--r--distrib/notes/alpha/install14
-rw-r--r--distrib/notes/alpha/whatis2
-rw-r--r--distrib/notes/alpha/xfer12
-rw-r--r--distrib/notes/amiga/contents28
-rw-r--r--distrib/notes/amiga/hardware2
-rw-r--r--distrib/notes/amiga/install14
-rw-r--r--distrib/notes/amiga/prep6
-rw-r--r--distrib/notes/amiga/upgrade18
-rw-r--r--distrib/notes/amiga/xfer4
-rw-r--r--distrib/notes/arc/contents22
-rw-r--r--distrib/notes/arc/hardware4
-rw-r--r--distrib/notes/arc/install6
-rw-r--r--distrib/notes/arc/whatis2
-rw-r--r--distrib/notes/atari/contents28
-rw-r--r--distrib/notes/hp300/contents24
-rw-r--r--distrib/notes/hp300/hardware2
-rw-r--r--distrib/notes/i386/contents24
-rw-r--r--distrib/notes/i386/hardware2
-rw-r--r--distrib/notes/i386/install14
-rw-r--r--distrib/notes/i386/upgrade6
-rw-r--r--distrib/notes/i386/whatis2
-rw-r--r--distrib/notes/i386/xfer8
-rw-r--r--distrib/notes/mac68k/contents32
-rw-r--r--distrib/notes/mac68k/hardware6
-rw-r--r--distrib/notes/mac68k/install6
-rw-r--r--distrib/notes/mac68k/upgrade8
-rw-r--r--distrib/notes/mac68k/whatis2
-rw-r--r--distrib/notes/mac68k/xfer2
-rw-r--r--distrib/notes/mirrors2
-rw-r--r--distrib/notes/mvme68k/contents22
-rw-r--r--distrib/notes/mvme68k/hardware2
-rw-r--r--distrib/notes/pc532/contents12
-rw-r--r--distrib/notes/pmax/contents30
-rw-r--r--distrib/notes/pmax/hardware4
-rw-r--r--distrib/notes/pmax/install12
-rw-r--r--distrib/notes/pmax/whatis2
-rw-r--r--distrib/notes/powerpc/contents24
-rw-r--r--distrib/notes/powerpc/hardware2
-rw-r--r--distrib/notes/powerpc/install14
-rw-r--r--distrib/notes/powerpc/upgrade6
-rw-r--r--distrib/notes/powerpc/whatis2
-rw-r--r--distrib/notes/powerpc/xfer8
-rw-r--r--distrib/notes/sparc/contents56
-rw-r--r--distrib/notes/sparc/hardware8
-rw-r--r--distrib/notes/sparc/install26
-rw-r--r--distrib/notes/sparc/upgrade4
-rw-r--r--distrib/notes/sparc/whatis6
-rw-r--r--distrib/notes/sparc/xfer20
-rw-r--r--distrib/notes/sun3/contents22
52 files changed, 311 insertions, 311 deletions
diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index d3a83152147..cd1a8449b18 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -1,4 +1,4 @@
-INSTALLATION NOTES for OpenBSD/MACHINE 2.1
+INSTALLATION NOTES for OpenBSD/MACHINE 2.2
What is OpenBSD?
@@ -21,7 +21,7 @@ information-gathering problems. Tools like ipf, ipnat, and nc have
been added to the tree because security conscious people often need
them.
-OpenBSD 2.1 has significantly enhanced the binary emulation subsystem
+OpenBSD 2.2 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
@@ -34,7 +34,7 @@ has entered US. Because of this, take care NOT to get the distrib-
ution from an FTP server in the US if you are outside of Canada and
the US.
-Many new user programs have been added in OpenBSD 2.1, as well,
+Many new user programs have been added in OpenBSD 2.2, as well,
bringing it closer to our goal of supplying a complete and modern
UN*X-like environment. Tools like perl and ksh are standard, as are
numerous other useful tools.
@@ -46,12 +46,12 @@ Sources of OpenBSD:
#include "mirrors"
-OpenBSD 2.1 Release Contents:
+OpenBSD 2.2 Release Contents:
-----------------------------
-The OpenBSD 2.1 release is organized in the following way. In the
-.../2.1 directory, there is one sub-directory per architecture, for
-each of the architectures that OpenBSD 2.1 has a binary distribution
+The OpenBSD 2.2 release is organized in the following way. In the
+.../2.2 directory, there is one sub-directory per architecture, for
+each of the architectures that OpenBSD 2.2 has a binary distribution
for. That is described further along in this document).
#include "contents"
diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index 3d5774abf3a..be2385a5b23 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,8 +1,8 @@
-The alpha-specific portion of the OpenBSD 2.1 release is found in the
+The alpha-specific portion of the OpenBSD 2.2 release is found in the
"alpha" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../2.1/alpha/
+.../2.2/alpha/
INSTALL.alpha Installation notes; this file.
floppy.fs The alpha boot and installation
@@ -30,12 +30,12 @@ Bootable installation/upgrade floppy:
system to the current version of OpenBSD.
The OpenBSD/alpha binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the alpha. There are seven binary
+comprise the OpenBSD 2.2 release for the alpha. There are seven binary
distribution sets. The binary distribution sets can be found in
-subdirectories of the "alpha/bins" subdirectory of the OpenBSD 2.1
+subdirectories of the "alpha/bins" subdirectory of the OpenBSD 2.2
distribution tree, and are as follows:
- base21 The OpenBSD/alpha 2.1 base binary distribution. You
+ base22 The OpenBSD/alpha 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -43,7 +43,7 @@ distribution tree, and are as follows:
everything described below.
[ 39M gzipped, 109.7M uncompressed ]
- comp21 The OpenBSD/alpha Compiler tools. All of the tools
+ comp22 The OpenBSD/alpha 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,
@@ -54,7 +54,7 @@ distribution tree, and are as follows:
call and library manual pages.
[ 14.5M gzipped, 52.7M uncompressed ]
- etc21 This distribution set contains the system
+ etc22 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -63,22 +63,22 @@ distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 89K gzipped, 448K uncompressed ]
- game21 This set includes the games and their manual pages.
+ game22 This set includes the games and their manual pages.
[ 5.0M gzipped, 15.5M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 2.4M gzipped, 8.9M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.7M gzipped, 5.9M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 2.3M gzipped, 8.4M uncompressed ]
diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 6adaf8d46ee..a4cee56343d 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,4 +1,4 @@
-OpenBSD/alpha 2.1 is expected to run on the following hardware.
+OpenBSD/alpha 2.2 is expected to run on the following hardware.
If you have hardware that is listed here and are unable to run
OpenBSD, or if you are able to run OpenBSD on hardware not listed
here, please send mail to <tech@openbsd.org> with as much information
diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index 08e0174e014..b7a32e9d35e 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -157,11 +157,11 @@ process again from scratch.
ftp if you are using a proxy.
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an ftp server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The ftp directory holding the distribution sets.
- The default value of pub/OpenBSD/2.1/alpha
+ The default value of pub/OpenBSD/2.2/alpha
is almost always correct.
5) The login and password for the ftp account.
The default will be correct unless you are
@@ -180,7 +180,7 @@ process again from scratch.
(assuming you have a proxy available to use).
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an http server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The directory holding the distribution sets.
@@ -223,7 +223,7 @@ process again from scratch.
You will also have to provide the relative path to the
directory on the CD which holds the distribution, for the
- alpha this is "2.1/alpha".
+ alpha this is "2.2/alpha".
For instructions on how to complete the installation from
the CD-ROM distribution, see the section named "Common
@@ -315,16 +315,16 @@ process again from scratch.
using, all the device nodes needed by the installed system will
be created for you and the file systems will be unmounted. For
this to work properly, it is expected that you have installed
- at least the "base21" and "etc21" distribution sets.
+ at least the "base22" and "etc22" distribution sets.
-Congratulations, you have successfully installed OpenBSD 2.1. When you
+Congratulations, you have successfully installed OpenBSD 2.2. 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 OpenBSD 2.1 distribution might need to be
+Some of the files in the OpenBSD 2.2 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/alpha/whatis b/distrib/notes/alpha/whatis
index 4e57d910b80..1d6ff745a11 100644
--- a/distrib/notes/alpha/whatis
+++ b/distrib/notes/alpha/whatis
@@ -1,4 +1,4 @@
-OpenBSD 2.1 is the first formal release of OpenBSD for the
+OpenBSD 2.2 is the second formal release of OpenBSD for the
alpha processor.
The worlds briefest but still comprehensive introduction to the Alpha:
diff --git a/distrib/notes/alpha/xfer b/distrib/notes/alpha/xfer
index 2d1e68bf316..41668642345 100644
--- a/distrib/notes/alpha/xfer
+++ b/distrib/notes/alpha/xfer
@@ -18,7 +18,7 @@ To boot from CD-ROM:
and enter "boot DEVICE" where DEVICE is the pka device. If this
does not work, you'll have to create a boot floppy or bootable
hard disk; follow the directions below. (A boot floppy image
- is included on the CD-ROM as 2.1/alpha/floppy.fs.)
+ is included on the CD-ROM as 2.2/alpha/floppy.fs.)
If you have a floppy drive on your alpha:
@@ -84,14 +84,14 @@ following:
(If you can't figure it out, ask your system administrator.)
In the above example, "<dist_directories>" are the
distribution sets' directories, for the distribution sets you
- wish to place on the tape. For instance, to put the "base21"
- and "etc21" distributions on tape (in order to do the absolute
+ wish to place on the tape. For instance, to put the "base22"
+ and "etc22" distributions on tape (in order to do the absolute
minimum installation to a new disk), you would do the
following:
- cd .../2.1 # the top of the tree
+ cd .../2.2 # the top of the tree
cd alpha/
- tar cf <tape_device> base21 etc21
+ tar cf <tape_device> base22 etc22
(Note that you still need to fill in "<tape_device>" in the
example.)
@@ -141,7 +141,7 @@ following:
Place the distribution sets you wish to upgrade somewhere in
your current file system tree. At a bare minimum, you must
upgrade the "base" binary distribution, and so must put the
- "base21" set somewhere in your file system. If you wish,
+ "base22" set somewhere in your file system. If you wish,
you can do the other sets, as well, but you should NOT upgrade
the "etc" distribution; the "etc" distribution contains system
configuration files that you should review and update by hand.
diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index 79853379cee..284082681a7 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -1,15 +1,15 @@
-The amiga-specific portion of the OpenBSD 2.1 release is found in the
+The amiga-specific portion of the OpenBSD 2.2 release is found in the
"amiga" subdirectory of the distribution. That subdirectory is layed
out as follows:
-.../2.1/amiga/
+.../2.2/amiga/
INSTALL.amiga This file.
CKSUM Output of the cksum(1) and md5(1) programs
MD5 usable for verification of the correctness
of downloaded files.
- X11/ The X window system for OpenBSD/amiga 2.1
+ X11/ The X window system for OpenBSD/amiga 2.2
bsd A generic OpenBSD kernel used both for
miniroot installation and as the first
@@ -19,7 +19,7 @@ out as follows:
bsd.rd A ramdisk OpenBSD kernel used for simple
installation.
- miniroot21.fs A miniroot filesystem image to be used
+ miniroot22.fs A miniroot filesystem image to be used
if you for some reason can't or don't
want to use the ramdisk installation
method.
@@ -44,17 +44,17 @@ Installation/upgrade miniroot file system:
NFS file system or ftp. You can also load distribution sets from
a SCSI tape or from one of your existing AmigaDOS partitions.
- This file is named "miniroot21.fs".
+ This file is named "miniroot22.fs".
The OpenBSD/amiga binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the amiga. There are seven binary
+comprise the OpenBSD 2.2 release for the amiga. There are seven binary
distribution sets. The binary distribution sets can be found in
-subdirectories of the "amiga/" subdirectory of the OpenBSD 2.1
+subdirectories of the "amiga/" subdirectory of the OpenBSD 2.2
distribution tree, and are as follows (all have ".tar.gz" appended to
the name given in the table below):
- base21 The OpenBSD/amiga 2.1 base binary distribution. You
+ base22 The OpenBSD/amiga 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -62,7 +62,7 @@ the name given in the table below):
everything described below.
[ 12M gzipped, 36M uncompressed ]
- comp21 The OpenBSD/amiga Compiler tools. The C, C++, and
+ comp22 The OpenBSD/amiga Compiler tools. The C, C++, and
FORTRAN language environments are supported. This set
includes the system include files (/usr/include), the
linker, the compiler tool chain, and the various system
@@ -73,7 +73,7 @@ the name given in the table below):
pages.
[ 7M gzipped, 24M uncompressed ]
- etc21 This distribution set contains the system configuration
+ etc22 This distribution set contains the system configuration
files that reside in /etc and in several other places.
This set MUST be installed if you are installing the
system from scratch, but should NOT be used if you are
@@ -82,22 +82,22 @@ the name given in the table below):
configuration files by hand.)
[ 90K gzipped, 450K uncompressed ]
- game21 This set includes the games and their manual pages.
+ game22 This set includes the games and their manual pages.
[ 3M gzipped, 7M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 2M gzipped, 9M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 2M gzipped, 6M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 1M gzipped, 4M uncompressed ]
diff --git a/distrib/notes/amiga/hardware b/distrib/notes/amiga/hardware
index 5cc16588290..83e59df2b78 100644
--- a/distrib/notes/amiga/hardware
+++ b/distrib/notes/amiga/hardware
@@ -1,4 +1,4 @@
-OpenBSD/amiga 2.1 runs on any amiga that has a 68020, 68030, 68040 or
+OpenBSD/amiga 2.2 runs on any amiga that has a 68020, 68030, 68040 or
68060 CPU with some form of FPU and MMU. It should also run on
MacroSystem's DraCo computer. The minimal configuration requires 4M of
RAM and about 55M of disk space. To install the entire system requires
diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index d3aa0894a39..464c158c99e 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -164,11 +164,11 @@ begin again from scratch.
ftp if you are using a proxy.
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an ftp server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The ftp directory holding the distribution sets.
- The default value of pub/OpenBSD/2.1/amiga
+ The default value of pub/OpenBSD/2.2/amiga
is almost always correct.
5) The login and password for the ftp account.
The default will be correct unless you are
@@ -187,7 +187,7 @@ begin again from scratch.
(assuming you have a proxy available to use).
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an http server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The directory holding the distribution sets.
@@ -230,7 +230,7 @@ begin again from scratch.
You will also have to provide the relative path to the
directory on the CD which holds the distribution, for the
- amiga this is "2.1/amiga".
+ amiga this is "2.2/amiga".
For instructions on how to complete the installation from
the CD-ROM distribution, see the section named "Common
@@ -321,16 +321,16 @@ begin again from scratch.
using, all the device nodes needed by the installed system will
be created for you and the file systems will be unmounted. For
this to work properly, it is expected that you have installed
- at least the "base21" and "etc21" distribution sets.
+ at least the "base22" and "etc22" distribution sets.
-Congratulations, you have successfully installed OpenBSD 2.1. When you
+Congratulations, you have successfully installed OpenBSD 2.2. 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 OpenBSD 2.1 distribution might need to be
+Some of the files in the OpenBSD 2.2 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/amiga/prep b/distrib/notes/amiga/prep
index bf0b9712eb9..e6b44638a6d 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -109,7 +109,7 @@ Transferring the miniroot filesystem:
for swapping.
Once the hard disk has been prepared for OpenBSD, the miniroot
- filesystem (miniroot21.fs) is transferred to the swap partition
+ filesystem (miniroot22.fs) is transferred to the swap partition
configured during the hard disk prep (or the existing swap
partition in the case of an upgrade). The xstreamtodev utility
provided in the "amiga/utilities" directory can be used on
@@ -122,7 +122,7 @@ Transferring the miniroot filesystem:
swap partition.
On AmigaDOS, the command:
- xstreamtodev --input=miniroot21.fs --rdb-name=<swap partition>
+ xstreamtodev --input=miniroot22.fs --rdb-name=<swap partition>
where <swap partition> is the name you gave to the OpenBSD
partition to be used for swapping. If xstreamtodev is unable to
determine the SCSI driver device name or the unit number of the
@@ -133,7 +133,7 @@ Transferring the miniroot filesystem:
up in single user state on the current system, or use the
"shutdown now" command to shutdown to single-uyser state. Then
copy the miniroot using dd:
- dd if=miniroot21.fs of=/dev/rsdXb
+ dd if=miniroot22.fs of=/dev/rsdXb
where /dev/rsdXb should be the device path of the swap partition
your system is configured to use. Once the file is copied,
reboot back to AmigaDOS to boot the new OpenBSD kernel. NOTE:
diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index 4cdf3f858f1..a9cd7215144 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -1,13 +1,13 @@
-The upgrade to OpenBSD 2.1 is a binary upgrade; it would be prohibitive
-to make users upgrade by compiling and installing the 2.1 sources, and
+The upgrade to OpenBSD 2.2 is a binary upgrade; it would be prohibitive
+to make users upgrade by compiling and installing the 2.2 sources, and
it would be very difficult to even compile a set of instructions that
allowed them to do so.
To do the upgrade, and if you are using the miniroot installation, you
must have the OpenBSD kernel on AmigaDOS and you must transfer the root
-filesystem miniroot21.fs onto the swap partition of the OpenBSD hard disk.
+filesystem miniroot22.fs onto the swap partition of the OpenBSD hard disk.
If you are using the ramdsik installation, the bsd.rd kernel is enough.
-You must also have at least the "base21" binary distribution set available,
+You must also have at least the "base22" 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 binaries. Since the old binaries are being overwritten in place,
@@ -32,7 +32,7 @@ To upgrade your system, follow the following instructions:
partition used by OpenBSD for swapping, as described in the
"Preparing your System for OpenBSD Installation" section above.
- Now boot up OpenBSD using the 2.1 kernel using the loadbsd
+ Now boot up OpenBSD using the 2.2 kernel using the loadbsd
command:
loadbsd -b bsd
@@ -48,7 +48,7 @@ To upgrade your system, follow the following instructions:
Ramdisk installation:
- Now boot up OpenBSD using the 2.1 kernel using the loadbsd
+ Now boot up OpenBSD using the 2.2 kernel using the loadbsd
command:
loadbsd bsd.rd
@@ -95,14 +95,14 @@ To upgrade your system, follow the following instructions:
After the software has been transferred to the machine (or
mounted, in the case of upgrading via NFS).
-Your system has now been upgraded to OpenBSD 2.1.
+Your system has now been upgraded to OpenBSD 2.2.
- After all this, your machine is a complete OpenBSD 2.1 system.
+ After all this, your machine is a complete OpenBSD 2.2 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, you will probably want to get the etc21.tar.gz distribution,
+ First, you will probably want to get the etc22.tar.gz distribution,
extract it, and compare its contents with those in your /etc/
directory. You will probably want to replace some of your
system configuration files, or incorporate some of the changes
diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer
index ecb37436fa7..fe49cb12e60 100644
--- a/distrib/notes/amiga/xfer
+++ b/distrib/notes/amiga/xfer
@@ -24,7 +24,7 @@ partition, optionally you must also get the miniroot image there
for later transfer to your swap partition as explained elsewhere.
For ramdisk installs you need to get both the bsd and bsd.rd
kernel images, and for miniroot installs you need bsd and the
-miniroot21.fs image.
+miniroot22.fs image.
To prepare for installing via an AmigaDOS partition:
@@ -104,7 +104,7 @@ following:
Place the distribution sets you wish to upgrade somewhere in
your current file system tree. At a bare minimum, you must
upgrade the "base" binary distribution, and so must put the
- "base21.tar.gz" set somewhere in your file system. If you wish,
+ "base22.tar.gz" set somewhere in your file system. If you wish,
you can do the other sets, as well, but you should NOT upgrade
the "etc" distribution; the "etc" distribution contains system
configuration files that you should review and update by hand.
diff --git a/distrib/notes/arc/contents b/distrib/notes/arc/contents
index fa7f184a62e..e95c67c42a0 100644
--- a/distrib/notes/arc/contents
+++ b/distrib/notes/arc/contents
@@ -1,8 +1,8 @@
-The ARC specific portion of the OpenBSD 2.1 release is found in the
+The ARC specific portion of the OpenBSD 2.2 release is found in the
"arc" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../2.1/arc/
+.../2.2/arc/
INSTALL.arc Installation notes; this file.
bsd.rd ARC RAMDISK kernel. This is the
@@ -24,12 +24,12 @@ The ARC ramdisk image is a bootable kernel+rootimage. This kernel is used
when a system is installed for the first time. The file is in ECOFF format.
The OpenBSD/arc binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for ARC systems. There are seven binary
+comprise the OpenBSD 2.2 release for ARC systems. There are seven binary
distribution sets. The binary distribution sets can be found in
-subdirectories of the "arc/bins" subdirectory of the OpenBSD 2.1
+subdirectories of the "arc/bins" subdirectory of the OpenBSD 2.2
distribution tree, and are as follows:
- base21 The OpenBSD/arc 2.1 base binary distribution. You
+ base22 The OpenBSD/arc 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -37,7 +37,7 @@ distribution tree, and are as follows:
everything described below.
[ 15.0M gzipped, 50.9M uncompressed ]
- comp21 The OpenBSD/arc Compiler tools. All of the tools
+ comp22 The OpenBSD/arc 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,
@@ -48,7 +48,7 @@ distribution tree, and are as follows:
call and library manual pages.
[ 15.9M gzipped, 60.2M uncompressed ]
- etc21 This distribution set contains the system
+ etc22 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -57,22 +57,22 @@ distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 92K gzipped, 450K uncompressed ]
- game21 This set includes the games and their manual pages.
+ game22 This set includes the games and their manual pages.
[ 2.9M gzipped, 7.5M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 2.5M gzipped, 9.4M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.8M gzipped, 6.2M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 1.0M gzipped, 4.2M uncompressed ]
diff --git a/distrib/notes/arc/hardware b/distrib/notes/arc/hardware
index 1c2122a0132..52b5d0e6e7e 100644
--- a/distrib/notes/arc/hardware
+++ b/distrib/notes/arc/hardware
@@ -1,9 +1,9 @@
-OpenBSD/arc 2.1 runs on the following classes of machines:
+OpenBSD/arc 2.2 runs on the following classes of machines:
- Acer PICA61 (RISC-PC) Systems.
- Deskstation rPC44.
- Deskstation Tyne.
-OpenBSD/pmax 2.1 does *not* (yet) run on these machines:
+OpenBSD/pmax 2.2 does *not* (yet) run on these machines:
- Mips Magnum
- Olivetti systems.
- SNI RMxxx machines.
diff --git a/distrib/notes/arc/install b/distrib/notes/arc/install
index cb6ed56a823..cea979d80aa 100644
--- a/distrib/notes/arc/install
+++ b/distrib/notes/arc/install
@@ -22,7 +22,7 @@ following string at the "Run a program" prompt:
to boot from an existing MSDOS FAT partition to which the ramdisk kernel
have been copied. Or from the CD-ROM:
- CD:\2.1\arc\bsd.rd
+ CD:\2.2\arc\bsd.rd
Exact input to describe the device path varies. Consult your ARC-Bios manual
for more information about the particular system.
@@ -83,13 +83,13 @@ So to boot the system to multiuser mode set:
OSLOADOPTIONS=Na
-Congratulations, you have successfully installed OpenBSD 2.1. When you
+Congratulations, you have successfully installed OpenBSD 2.2. 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 OpenBSD 2.1 distribution might need to be
+Some of the files in the OpenBSD 2.2 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
diff --git a/distrib/notes/arc/whatis b/distrib/notes/arc/whatis
index f489aaae098..858e48e7e07 100644
--- a/distrib/notes/arc/whatis
+++ b/distrib/notes/arc/whatis
@@ -1,3 +1,3 @@
-OpenBSD 2.1 is the first release of OpenBSD for MIPS R4K ARC Class
+OpenBSD 2.2 is the first release of OpenBSD for MIPS R4K ARC Class
systems. This release has support for R4000PC, R4400PC, R4600PC and
R4700PC processors.
diff --git a/distrib/notes/atari/contents b/distrib/notes/atari/contents
index b18f948f7bc..5aff1a00634 100644
--- a/distrib/notes/atari/contents
+++ b/distrib/notes/atari/contents
@@ -1,8 +1,8 @@
-The Atari-specific portion of the OpenBSD 2.1 release is found in the
+The Atari-specific portion of the OpenBSD 2.2 release is found in the
"atari" subdirectory of the distribution. That subdirectory is layed
out as follows:
-.../2.1/atari/
+.../2.2/atari/
INSTALL.atari This file.
bins/ atari binary distribution sets;
@@ -17,7 +17,7 @@ out as follows:
installation section, below.
There are three atari floppy images to be found in the "atari/floppies"
-subdirectory of the OpenBSD 2.1 distribution. One of them is a
+subdirectory of the OpenBSD 2.2 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
@@ -29,7 +29,7 @@ Bootable Kernel floppy:
and the GENERIC kernel. It is setup so that you can insert it
int your floppy drive, and start the programs from GEM.
- This floppy is named boot-21.fs
+ This floppy is named boot-22.fs
Installation floppy:
@@ -42,15 +42,15 @@ Installation floppy:
file system or ftp. You can also load distribution sets from
a SCSI tape or from one of your existing TOS partitions.
- This floppy's are named "inst-21.fs.1" and "inst-21.fs.2".
+ This floppy's are named "inst-22.fs.1" and "inst-22.fs.2".
The OpenBSD/atari binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the atari. There are seven binary
+comprise the OpenBSD 2.2 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/bins"
-subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
+subdirectory of the OpenBSD 2.2 distribution tree, and are as follows:
- base21 The OpenBSD/atari 2.1 base binary distribution. You
+ base22 The OpenBSD/atari 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -58,7 +58,7 @@ subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
everything described below.
[ 7M gzipped, 19M uncompressed ]
- comp21 The OpenBSD/atari Compiler tools. All of the tools
+ comp22 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,
@@ -69,7 +69,7 @@ subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
call and library manual pages.
[ 4M gzipped, 12M uncompressed ]
- etc21 This distribution set contains the system
+ etc22 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -78,22 +78,22 @@ subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 50K gzipped, 280K uncompressed ]
- games21 This set includes the games and their manual pages.
+ games22 This set includes the games and their manual pages.
[ 1M gzipped, 3M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 730K gzipped, 3M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 2M gzipped, 6M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 784K gzipped, 3M uncompressed ]
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index 31028bd7188..20c00410e8a 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -1,8 +1,8 @@
-The hp300-specific portion of the OpenBSD 2.1 release is found in the
+The hp300-specific portion of the OpenBSD 2.2 release is found in the
"hp300" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../2.1/hp300/
+.../2.2/hp300/
INSTALL.hp300 This file
bins/ hp300 binary distribution sets;
@@ -13,12 +13,12 @@ out as follows:
see below.
The OpenBSD/hp300 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the hp300. There are seven binary
+comprise the OpenBSD 2.2 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/bins" subdirectory of
-the OpenBSD 2.1 distribution tree, and are as follows:
+the OpenBSD 2.2 distribution tree, and are as follows:
- base21 The OpenBSD/hp300 2.1 base binary distribution. You
+ base22 The OpenBSD/hp300 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -26,7 +26,7 @@ the OpenBSD 2.1 distribution tree, and are as follows:
everything described below.
[ 7.2M gzipped, 19M uncompressed ]
- comp21 The OpenBSD/hp300 Compiler tools. All of the tools
+ comp22 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
@@ -36,7 +36,7 @@ the OpenBSD 2.1 distribution tree, and are as follows:
call and library manual pages.
[ 4.6M gzipped, 14.7M uncompressed ]
- etc21 This distribution set contains the system configuration
+ etc22 This distribution set contains the system configuration
files that reside in /etc and in several other places.
This set MUST be installed if you are installing the
system from scratch, but should NOT be used if you are
@@ -45,22 +45,22 @@ the OpenBSD 2.1 distribution tree, and are as follows:
configuration files by hand.)
[ 64K gzipped, 348K uncompressed ]
- games21 This set includes the games and their manual pages.
+ games22 This set includes the games and their manual pages.
[ 2.8M gzipped, 6.8M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 850K gzipped, 3.3M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.8M gzipped, 6.5M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 770K gzipped, 2.8M uncompressed ]
@@ -77,7 +77,7 @@ The following are included in the `.../install' directory:
This is useful if you are installing
a diskless OpenBSD/hp300 system.
- inst-21.fs.gz A gzipped copy of the miniroot filesystem.
+ inst-22.fs.gz A gzipped copy of the miniroot filesystem.
bsd.gz A gzipped GENERIC kernel.
diff --git a/distrib/notes/hp300/hardware b/distrib/notes/hp300/hardware
index 5297f71c9ec..f3cd168b4cb 100644
--- a/distrib/notes/hp300/hardware
+++ b/distrib/notes/hp300/hardware
@@ -1,4 +1,4 @@
-OpenBSD/hp300 2.0 will run on most HP 9000/300- and 400-series machines.
+OpenBSD/hp300 2.2 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/i386/contents b/distrib/notes/i386/contents
index 6dcf7b9c695..9ef5fe9155b 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,8 +1,8 @@
-The i386-specific portion of the OpenBSD 2.1 release is found in the
+The i386-specific portion of the OpenBSD 2.2 release is found in the
"i386" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../2.1/i386/
+.../2.2/i386/
INSTALL.i386 Installation notes; this file.
floppy.fs The i386 boot and installation
@@ -17,7 +17,7 @@ out as follows:
As well you may be interested in
-.../2.1/tools/
+.../2.2/tools/
miscellaneous i386 installation utilities like
rawwrite.exe, gzip.exe, and pfdisk.exe; see
installation section, below.
@@ -41,12 +41,12 @@ Bootable installation/upgrade floppy:
system to the current version of OpenBSD.
The OpenBSD/i386 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the i386. There are seven binary
+comprise the OpenBSD 2.2 release for the i386. There are seven binary
distribution sets. The binary distribution sets can be found in
-subdirectories of the "i386/bins" subdirectory of the OpenBSD 2.1
+subdirectories of the "i386/bins" subdirectory of the OpenBSD 2.2
distribution tree, and are as follows:
- base21 The OpenBSD/i386 2.1 base binary distribution. You
+ base22 The OpenBSD/i386 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -54,7 +54,7 @@ distribution tree, and are as follows:
everything described below.
[ 12.5M gzipped, 35.1M uncompressed ]
- comp21 The OpenBSD/i386 Compiler tools. All of the tools
+ comp22 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,
@@ -65,7 +65,7 @@ distribution tree, and are as follows:
call and library manual pages.
[ 7.7M gzipped, 24.2M uncompressed ]
- etc21 This distribution set contains the system
+ etc22 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -74,22 +74,22 @@ distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 92K gzipped, 450K uncompressed ]
- game21 This set includes the games and their manual pages.
+ game22 This set includes the games and their manual pages.
[ 2.8M gzipped, 6.7M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 2.5M gzipped, 9.6M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.7M gzipped, 6.1M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 1.0M gzipped, 3.5M uncompressed ]
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 6247111b4c0..d8d42df02fa 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-OpenBSD/i386 2.1 runs on ISA (AT-Bus), EISA, PCI, and VL-bus systems
+OpenBSD/i386 2.2 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,
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index 3d8d59d2a9b..e65f570573c 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -197,11 +197,11 @@ process again from scratch.
ftp if you are using a proxy.
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an ftp server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The ftp directory holding the distribution sets.
- The default value of pub/OpenBSD/2.1/i386
+ The default value of pub/OpenBSD/2.2/i386
is almost always correct.
5) The login and password for the ftp account.
The default will be correct unless you are
@@ -220,7 +220,7 @@ process again from scratch.
(assuming you have a proxy available to use).
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an http server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The directory holding the distribution sets.
@@ -263,7 +263,7 @@ process again from scratch.
You will also have to provide the relative path to the
directory on the CD which holds the distribution, for the
- i386 this is "2.1/i386".
+ i386 this is "2.2/i386".
For instructions on how to complete the installation from
the CD-ROM distribution, see the section named "Common
@@ -354,16 +354,16 @@ process again from scratch.
using, all the device nodes needed by the installed system will
be created for you and the file systems will be unmounted. For
this to work properly, it is expected that you have installed
- at least the "base21" and "etc21" distribution sets.
+ at least the "base22" and "etc22" distribution sets.
-Congratulations, you have successfully installed OpenBSD 2.1. When you
+Congratulations, you have successfully installed OpenBSD 2.2. 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 OpenBSD 2.1 distribution might need to be
+Some of the files in the OpenBSD 2.2 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/upgrade b/distrib/notes/i386/upgrade
index 59718199115..3951aa129c0 100644
--- a/distrib/notes/i386/upgrade
+++ b/distrib/notes/i386/upgrade
@@ -122,7 +122,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 "upgr20" floppy from
- the floppy drive, and replace it with the OpenBSD 2.1
+ the floppy drive, and replace it with the OpenBSD 2.2
kernel-copy floppy that you previously booted from. Reboot
with that floppy.
@@ -151,10 +151,10 @@ 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 OpenBSD 2.1.
+Your system has now been upgraded to OpenBSD 2.2.
After a new kernel has been copied to your hard disk, your
- machine is a complete OpenBSD 2.1 system. However, that
+ machine is a complete OpenBSD 2.2 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.
diff --git a/distrib/notes/i386/whatis b/distrib/notes/i386/whatis
index be2920e7bf6..54db3591ed7 100644
--- a/distrib/notes/i386/whatis
+++ b/distrib/notes/i386/whatis
@@ -1,3 +1,3 @@
-For the i386, OpenBSD 2.1 brings greater stability and security. As a
+For the i386, OpenBSD 2.2 brings greater stability and security. As a
side effect of the full security audit, many userland programs have
been significantly cleaned up and debugged.
diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer
index 61c297097a9..9670e782f14 100644
--- a/distrib/notes/i386/xfer
+++ b/distrib/notes/i386/xfer
@@ -47,14 +47,14 @@ following:
(If you can't figure it out, ask your system administrator.)
In the above example, "<dist_directories>" are the
distribution sets' directories, for the distribution sets you
- wish to place on the tape. For instance, to put the "base21"
- and "etc21" distributions on tape (in order to do the absolute
+ wish to place on the tape. For instance, to put the "base22"
+ and "etc22" distributions on tape (in order to do the absolute
minimum installation to a new disk), you would do the
following:
cd .../1.2 # the top of the tree
cd i386/
- tar cf <tape_device> base21 etc21
+ tar cf <tape_device> base22 etc22
(Note that you still need to fill in "<tape_device>" in the
example.)
@@ -104,7 +104,7 @@ following:
Place the distribution sets you wish to upgrade somewhere in
your current file system tree. At a bare minimum, you must
upgrade the "base" binary distribution, and so must put the
- "base21" set somewhere in your file system. If you wish,
+ "base22" set somewhere in your file system. If you wish,
you can do the other sets, as well, but you should NOT upgrade
the "etc" distribution; the "etc" distribution contains system
configuration files that you should review and update by hand.
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index be4e1796a58..d5477590833 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,31 +1,31 @@
-The mac68k-specific portion of the OpenBSD 2.1 release is found in the
+The mac68k-specific portion of the OpenBSD 2.2 release is found in the
"mac68k" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../2.1/mac68k/
+.../2.2/mac68k/
INSTALL.mac68k This file
utils/ The mac68k installation utilities for MacOS.
The OpenBSD/mac68k binary distribution sets contain all the binaries which
-are need to run the OpenBSD 2.1 release for the mac68k. There are eight binary
+are need to run the OpenBSD 2.2 release for the mac68k. There are eight binary
distribution sets. The binary distribution sets can be found in the
-"mac68k/" of the OpenBSD 2.1 distribution tree, and
+"mac68k/" of the OpenBSD 2.2 distribution tree, and
are as follows:
- bsd21 The OpenBSD/mac68k 2.1 kernel binary. You MUST
+ bsd22 The OpenBSD/mac68k 2.2 kernel binary. You MUST
install this file. It is the kernel that you need
to boot the system.
[ 1.2MB uncompressed ]
- bsd21-genericsbc The OpenBSD/mac68k kernel binary. This is
- identical in every way to bsd21.tar.gz accept that
+ bsd22-genericsbc The OpenBSD/mac68k kernel binary. This is
+ identical in every way to bsd22.tar.gz accept that
it enables a different SCSI driver which may allow
some otherwise incompatible SCSI disks to function
with OpenBSD/mac68k. You must install either this
- or bsd21.tar.gz.
+ or bsd22.tar.gz.
[ 1.2MB uncompressed ]
- base21.tar.gz The OpenBSD/mac68k 2.1 base binary distribution. You
+ base22.tar.gz The OpenBSD/mac68k 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -33,7 +33,7 @@ are as follows:
everything described below.
[ 11.6MB gzipped, 35.8MB uncompressed ]
- comp21.tar.gz The OpenBSD/mac68k Compiler tools. All of the tools
+ comp22.tar.gz The OpenBSD/mac68k Compiler tools. All of the tools
relating to C, C++, and FORTRAN (yes, there are two!).
This set includes the system header files
(/usr/include), the linker, the compiler tool chain,
@@ -46,7 +46,7 @@ are as follows:
functional system.
[ 7.4MB gzipped, 23.8MB uncompressed ]
- etc21.tar.gz This distribution set contains the system
+ etc22.tar.gz This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -55,18 +55,18 @@ are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 90K gzipped, 450K uncompressed ]
- game21.tar.gz This set includes the BSD games and their manual pages.
+ game22.tar.gz This set includes the BSD games and their manual pages.
It's installation is optional.
[ 2.8MB gzipped, 6.9MB uncompressed ]
- man21.tar.gz This set includes all of the manual pages for the
+ man22.tar.gz This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets. Installation of
this set is completely optional but is highly recommended.
[ 2.4MB gzipped, 9.3MB uncompressed ]
- misc21.tar.gz This set includes the system dictionaries (which are
+ misc22.tar.gz This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default as well as
@@ -75,14 +75,14 @@ are as follows:
of many system programs.
[ 1.7MB gzipped, 6.1MB uncompressed ]
- text21.tar.gz This set includes OpenBSD's text processing tools,
+ text22.tar.gz This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages. This set is highly recommended as
these programs are depended upon for such basic
system functions as reading manual pages.
[ 0.9MB gzipped, 3.6MB uncompressed ]
-The directory '../2.1/mac68k/utils' contains a number of utilities for the
+The directory '../2.2/mac68k/utils' contains a number of utilities for the
MacOS to aid the installation and configuration of OpenBSD. The files in
this directory are as follows:
diff --git a/distrib/notes/mac68k/hardware b/distrib/notes/mac68k/hardware
index 72060302986..4c8f9b8596a 100644
--- a/distrib/notes/mac68k/hardware
+++ b/distrib/notes/mac68k/hardware
@@ -1,14 +1,14 @@
-OpenBSD/mac68k 2.1 runs on several of the older Macintosh computers.
+OpenBSD/mac68k 2.2 runs on several of the older Macintosh computers.
6MB of RAM should be sufficient to boot and the system can probably
be squeezed onto a 60MB 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 80MB will be necessary to install all of the OpenBSD 2.1 binary
+About 80MB will be necessary to install all of the OpenBSD 2.2 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).
-OpenBSD/mac68k 2.1 now runs on most 680x0 Macintoshes. Specifically, it
+OpenBSD/mac68k 2.2 now runs on most 680x0 Macintoshes. Specifically, it
should work on:
68020 with 68851 PMMU and 68881 FPU
68030 with 68882 FPU (most Macs have this)
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index 48de91630fa..da3c4e2742f 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
- base21, bsd, and any other packages you wish to install at
+ base22, 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
@@ -98,13 +98,13 @@ to a long-standing bug, the preferences will not be saved unless you
quit.
If the system comes up, congratulations, you have successfully
-installed OpenBSD 2.1. When you reboot into OpenBSD, you should log
+installed OpenBSD 2.2. 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 OpenBSD 2.1 distribution might need to be
+Some of the files in the OpenBSD 2.2 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/upgrade b/distrib/notes/mac68k/upgrade
index 0c820243c6b..b4bdb9f8d96 100644
--- a/distrib/notes/mac68k/upgrade
+++ b/distrib/notes/mac68k/upgrade
@@ -1,13 +1,13 @@
-To upgrade to OpenBSD 2.1 from a previous version, you should follow the
+To upgrade to OpenBSD 2.2 from a previous version, you should follow the
instructions on installing the system beginning with using the MacBSD
Install Utility. All you need do is copy each of the distribution sets in
over your current system from the MacOS.
-However, you should not copy the etc21.tar.gz file into the system.
+However, you should not copy the etc22.tar.gz file into the system.
Instead, download it while running OpenBSD and put it in /tmp or some other
-harmless place and unpack it with a command like 'tar zxvf etc21.tar.gz'.
+harmless place and unpack it with a command like 'tar zxvf etc22.tar.gz'.
You will then have an etc directory with current system configuration files
in it. Use this to carefully upgrade your files in the running /etc and
reboot the system. Also, it is hihgly recommended that when upgrading your
kernel binary (/bsd) you backup the old, working kernel and extract
-bsd21.tar.gz into / only from OpenBSD.
+bsd22.tar.gz into / only from OpenBSD.
diff --git a/distrib/notes/mac68k/whatis b/distrib/notes/mac68k/whatis
index 9fe9f6d03a0..9a52a18e066 100644
--- a/distrib/notes/mac68k/whatis
+++ b/distrib/notes/mac68k/whatis
@@ -1,4 +1,4 @@
-OpenBSD 2.1 is the second release of OpenBSD for Macintosh
+OpenBSD 2.2 is the second release of OpenBSD for Macintosh
computers. As always, there is much to be done on this
architecture, and help is very much appreciated. However,
a wide variety of hardware and software is completely
diff --git a/distrib/notes/mac68k/xfer b/distrib/notes/mac68k/xfer
index ce74f93054a..13e17137144 100644
--- a/distrib/notes/mac68k/xfer
+++ b/distrib/notes/mac68k/xfer
@@ -1,7 +1,7 @@
Installation is really only supported from the local Macintosh
hard drive or from an AppleShare volume. This means that you'll
need at least enough room for the largest file that you will have
-to install. This is the 6.2M base21 file. There has been talk
+to install. This is the 6.2M base22 file. There has been talk
of allowing an install from split files. If you have the time,
desire, and knowledge, please feel free to add that functionality.
diff --git a/distrib/notes/mirrors b/distrib/notes/mirrors
index 4547beb8e07..8387a344ddf 100644
--- a/distrib/notes/mirrors
+++ b/distrib/notes/mirrors
@@ -31,6 +31,6 @@ ftp://pub.seastrom.com/pub/OpenBSD ==
ftp://ftp1.usa.openbsd.org/pub/OpenBSD</a><br>
-As well, the file ftp://ftp.openbsd.org/pub/OpenBSD/2.1/ftplist
+As well, the file ftp://ftp.openbsd.org/pub/OpenBSD/2.2/ftplist
contains a list which is continually updated. If you wish to become a
distribution site for OpenBSD, contact deraadt@cvs.openbsd.org.
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index acf95d796e5..f725ae0faea 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -1,8 +1,8 @@
-The mvme68k-specific portion of the OpenBSD 2.1 release is found in the
+The mvme68k-specific portion of the OpenBSD 2.2 release is found in the
"mvme68k" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../2.1/mvme68k/
+.../2.2/mvme68k/
INSTALL.mvme68k this document
tars/ mvme68k binary distribution sets;
see below.
@@ -10,12 +10,12 @@ out as follows:
and an installation script.
The OpenBSD/mvme68k binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the mvme68k. There are seven binary
+comprise the OpenBSD 2.2 release for the mvme68k. There are seven binary
distribution sets, and the "security" distribution set. The binary
distribution sets can be found in subdirectories of the "mvme68k/tars"
-subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
+subdirectory of the OpenBSD 2.2 distribution tree, and are as follows:
- base21 The OpenBSD/mvme68k 2.1 base binary distribution. You
+ base22 The OpenBSD/mvme68k 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -23,7 +23,7 @@ subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
everything described below.
[ 11.7M gzipped, 36.0M uncompressed ]
- comp21 The OpenBSD/mvme68k Compiler tools. All of the tools
+ comp22 The OpenBSD/mvme68k Compiler tools. All of the tools
relating to C, C++, and FORTRAN.
This set includes the system include files
(/usr/include), the linker, the compiler tool chain,
@@ -34,7 +34,7 @@ subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
call and library manual pages.
[ 7.4M gzipped, 23.8M uncompressed ]
- etc21 This distribution set contains the system
+ etc22 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -43,22 +43,22 @@ subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 91K gzipped, 450K uncompressed ]
- games21 This set includes the games and their manual pages.
+ games22 This set includes the games and their manual pages.
[ 2.8M gzipped, 7.0M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 1.8M gzipped, 9.3M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.1M gzipped, 6.2M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 1.0M gzipped, 3.7M uncompressed ]
diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index 85d6c612f12..28e41b642d4 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -1,4 +1,4 @@
-OpenBSD/mvme68k 2.1 runs on the following classes of machines:
+OpenBSD/mvme68k 2.2 runs on the following classes of machines:
- MVME147 - Motorola with 68030 and 68881
- MVME162 - Motorola with 68040
- MVME167 - Motorola with 68040
diff --git a/distrib/notes/pc532/contents b/distrib/notes/pc532/contents
index 2a99b4f9a72..304c2f4b4af 100644
--- a/distrib/notes/pc532/contents
+++ b/distrib/notes/pc532/contents
@@ -1,11 +1,11 @@
-The pc532-specific portion of the OpenBSD 2.1 release is found in the
+The pc532-specific portion of the OpenBSD 2.2 release is found in the
"pc532" subdirectory of the distribution. That subdirectory contains
the files as follows:
-.../2.1/pc532/
+.../2.2/pc532/
INSTALL.pc532 Installation notes; this file.
- inst-21.fs.gz Installation file system.
+ inst-22.fs.gz Installation file system.
download.c.gz Source for a pc532 ROM compat download pgm
bsd.default.gz Upgrade kernel
base.tar.gz base distribution
@@ -20,7 +20,7 @@ the files as follows:
The binary distribution consists of the following files:
base.tar.gz
- The OpenBSD/pc532 2.1 base binary distribution. You
+ The OpenBSD/pc532 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -78,12 +78,12 @@ is supported by the following files:
Initial file system used via SCSI floppy or downloaded into
memory:
- inst-21.fs -- file system containing boot loader
+ inst-22.fs -- file system containing boot loader
and install kernel with 2MB
ram root file system.
download.c -- source for the program to download
- inst-21.fs into memory via the
+ inst-22.fs into memory via the
pc532 ROM monitor.
diff --git a/distrib/notes/pmax/contents b/distrib/notes/pmax/contents
index 9a34e369cf4..3580097c7bf 100644
--- a/distrib/notes/pmax/contents
+++ b/distrib/notes/pmax/contents
@@ -1,8 +1,8 @@
-The pmax-specific portion of the OpenBSD 2.1 release is found in the
+The pmax-specific portion of the OpenBSD 2.2 release is found in the
"pmax" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../2.1/pmax/
+.../2.2/pmax/
INSTALL.pmax Installation notes; this file.
*.gz pmax binary distribution sets;
@@ -11,21 +11,21 @@ out as follows:
simpleroot* pmax boot and installation
simpleroot files; see below.
-There is a pmax simpleroot image named simpleroot21.fs (it is usually
-compressed using gzip - simpleroot21.fs.gz - so you need gunzip first
-to uncompress it) subdirectory of the OpenBSD 2.1 distribution. This
+There is a pmax simpleroot image named simpleroot22.fs (it is usually
+compressed using gzip - simpleroot22.fs.gz - so you need gunzip first
+to uncompress it) subdirectory of the OpenBSD 2.2 distribution. This
file you can dump onto a disk and boot from it to start the installation
-of OpenBSD/pmax. Also there is a simpleroot21.tar.gz file there. It
+of OpenBSD/pmax. Also there is a simpleroot22.tar.gz file there. It
can be used as root area on the NFS server if you plan to install via
network.
The OpenBSD/pmax binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the pmax. There are seven binary
+comprise the OpenBSD 2.2 release for the pmax. There are seven binary
distribution sets. The binary distribution sets can be found in
-subdirectories of the "pmax/bins" subdirectory of the OpenBSD 2.1
+subdirectories of the "pmax/bins" subdirectory of the OpenBSD 2.2
distribution tree, and are as follows:
- base21 The OpenBSD/pmax 2.1 base binary distribution. You
+ base22 The OpenBSD/pmax 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -33,7 +33,7 @@ distribution tree, and are as follows:
everything described below.
[ 15.0M gzipped, 50.8M uncompressed ]
- comp21 The OpenBSD/pmax Compiler tools. All of the tools
+ comp22 The OpenBSD/pmax 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,
@@ -44,7 +44,7 @@ distribution tree, and are as follows:
call and library manual pages.
[ 16.2M gzipped, 61.1M uncompressed ]
- etc21 This distribution set contains the system
+ etc22 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -53,22 +53,22 @@ distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 93K gzipped, 450K uncompressed ]
- game21 This set includes the games and their manual pages.
+ game22 This set includes the games and their manual pages.
[ 2.9M gzipped, 7.5M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 2.5M gzipped, 9.4M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.8M gzipped, 6.2M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 1.0M gzipped, 4.2M uncompressed ]
diff --git a/distrib/notes/pmax/hardware b/distrib/notes/pmax/hardware
index a91efe63938..fa737a7b85a 100644
--- a/distrib/notes/pmax/hardware
+++ b/distrib/notes/pmax/hardware
@@ -1,11 +1,11 @@
-OpenBSD/pmax 2.1 runs on the following classes of machines:
+OpenBSD/pmax 2.2 runs on the following classes of machines:
- Decstation 2100 and 3100, also known as "pmin" and "pmax"
- Personal Decstations (5000/20, and /25) also knonw as "MAXINE"
- Decstation 5000/120, /125, and /133, also knonw as "3MIN"
- Decstation 5000/200, also knonw as "3MAX"
- Decstation 5000/240, als knonw as "3MAXPLUS"
-OpenBSD/pmax 2.1 does *not* (yet) run on these machines:
+OpenBSD/pmax 2.2 does *not* (yet) run on these machines:
- Decstation 5100 (an r2000-based cousin of the Decstation 3100)
- Decsystem 5400 and 5500 (Qbus-based systems, similar to a
Vax 'Mayfair' and 'Mayfair II', but with an r2000a or r3000
diff --git a/distrib/notes/pmax/install b/distrib/notes/pmax/install
index fe3e58994f6..d7d2aa37304 100644
--- a/distrib/notes/pmax/install
+++ b/distrib/notes/pmax/install
@@ -28,7 +28,7 @@ onto the pmax which allows you to write to the raw disk - i.e. on all
UN*X like operatingsystems it should work using "dd". On OpenBSD
as well as SunOS you use a command like:
- # dd if=simpleroot21.fs of=/dev/rsd0c bs=20b conv=sync
+ # dd if=simpleroot22.fs of=/dev/rsd0c bs=20b conv=sync
Especially on OpenBSD/pmax you'll have to use /dev/rrz0c or something
like that instead of /dev/rsd0c.
@@ -83,7 +83,7 @@ documentation that came with it (on SunOS systems, add_client(8) is a
good start).
One part of the distribution of OpenBSD/pmax is a file called
-simpleroot21.tar.gz which is a good start for the rootfilesystem area on
+simpleroot22.tar.gz which is a good start for the rootfilesystem area on
the NFS server then you want to install via network.
A few configuration files need to be edited:
@@ -102,7 +102,7 @@ A few configuration files need to be edited:
Now you must populate the the `/dev' directory for your client. If you
have an intelligent tar command on the NFS server the /dev directory
-inside the simpleroot21.tar.gz should be usable (i.e. containing
+inside the simpleroot22.tar.gz should be usable (i.e. containing
special devices and not only files) - else you'll have to remake the
devices on the server using
@@ -172,7 +172,7 @@ Ok - now let's see what to do to set up the server:
mkdir /export/root
cd /export/root
- tar xvpzf /some_path/simpleroot21.tar.gz
+ tar xvpzf /some_path/simpleroot22.tar.gz
vi /etc/exports (to add the above line)
kill -HUP `cat /var/run/mountd.pid` (so that mountd rereads exports)
@@ -414,13 +414,13 @@ incarnation to make the root filesystem writable is
assuming your rootdisk is rz0.
-Congratulations, you have successfully installed OpenBSD 2.1. When you
+Congratulations, you have successfully installed OpenBSD 2.2. 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 OpenBSD 2.1 distribution might need to be
+Some of the files in the OpenBSD 2.2 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
diff --git a/distrib/notes/pmax/whatis b/distrib/notes/pmax/whatis
index 053b292c61c..33243608692 100644
--- a/distrib/notes/pmax/whatis
+++ b/distrib/notes/pmax/whatis
@@ -1,4 +1,4 @@
-OpenBSD 2.1 is the first public release of OpenBSD for the DECstation
+OpenBSD 2.2 is the first public release of OpenBSD for the DECstation
and DECsystem family of computers. This release includes kernel
support for ELF shared libraries and uses them througout the
userland.
diff --git a/distrib/notes/powerpc/contents b/distrib/notes/powerpc/contents
index 905d1da4332..bca17d866e0 100644
--- a/distrib/notes/powerpc/contents
+++ b/distrib/notes/powerpc/contents
@@ -1,8 +1,8 @@
-The powerpc-specific portion of the OpenBSD 2.1 release is found in the
+The powerpc-specific portion of the OpenBSD 2.2 release is found in the
"powerpc" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../2.1/powerpc/
+.../2.2/powerpc/
INSTALL.powerpc Installation notes; this file.
floppy.fs The powerpc boot and installation
@@ -17,7 +17,7 @@ out as follows:
As well you may be interested in
-.../2.1/tools/
+.../2.2/tools/
miscellaneous i386 installation utilities like
rawwrite.exe, gzip.exe, and pfdisk.exe; see
installation section, below.
@@ -39,12 +39,12 @@ Bootable installation/upgrade floppy:
system to the current version of OpenBSD.
The OpenBSD/powerpc binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the powerpc. There are seven binary
+comprise the OpenBSD 2.2 release for the powerpc. There are seven binary
distribution sets. The binary distribution sets can be found in
-subdirectories of the "powerpc/bins" subdirectory of the OpenBSD 2.1
+subdirectories of the "powerpc/bins" subdirectory of the OpenBSD 2.2
distribution tree, and are as follows:
- base21 The OpenBSD/powerpc 2.1 base binary distribution. You
+ base22 The OpenBSD/powerpc 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -52,7 +52,7 @@ distribution tree, and are as follows:
everything described below.
[ 12.5M gzipped, 35.1M uncompressed ]
- comp21 The OpenBSD/powerpc Compiler tools. All of the tools
+ comp22 The OpenBSD/powerpc 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,
@@ -63,7 +63,7 @@ distribution tree, and are as follows:
call and library manual pages.
[ 7.7M gzipped, 24.2M uncompressed ]
- etc21 This distribution set contains the system
+ etc22 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -72,22 +72,22 @@ distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 92K gzipped, 450K uncompressed ]
- game21 This set includes the games and their manual pages.
+ game22 This set includes the games and their manual pages.
[ 2.8M gzipped, 6.7M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 2.5M gzipped, 9.6M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.7M gzipped, 6.1M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 1.0M gzipped, 3.5M uncompressed ]
diff --git a/distrib/notes/powerpc/hardware b/distrib/notes/powerpc/hardware
index 1012ecb59aa..b211626bf3d 100644
--- a/distrib/notes/powerpc/hardware
+++ b/distrib/notes/powerpc/hardware
@@ -1,4 +1,4 @@
-OpenBSD/powerpc 2.1 runs on ISA (AT-Bus), and PCI buses
+OpenBSD/powerpc 2.2 runs on ISA (AT-Bus), and PCI buses
with 603, 603e, 604, 604e processors.
Only systems with openfirmware are supported.
Has been tested on various Motorola (MCG) boards:
diff --git a/distrib/notes/powerpc/install b/distrib/notes/powerpc/install
index ed054ffd6be..3e5dd40b9c2 100644
--- a/distrib/notes/powerpc/install
+++ b/distrib/notes/powerpc/install
@@ -199,11 +199,11 @@ process again from scratch.
ftp if you are using a proxy.
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an ftp server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The ftp directory holding the distribution sets.
- The default value of pub/OpenBSD/2.1/powerpc
+ The default value of pub/OpenBSD/2.2/powerpc
is almost always correct.
5) The login and password for the ftp account.
The default will be correct unless you are
@@ -222,7 +222,7 @@ process again from scratch.
(assuming you have a proxy available to use).
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an http server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The directory holding the distribution sets.
@@ -265,7 +265,7 @@ process again from scratch.
You will also have to provide the relative path to the
directory on the CD which holds the distribution, for the
- powerpc this is "2.1/powerpc".
+ powerpc this is "2.2/powerpc".
For instructions on how to complete the installation from
the CD-ROM distribution, see the section named "Common
@@ -356,16 +356,16 @@ process again from scratch.
using, all the device nodes needed by the installed system will
be created for you and the file systems will be unmounted. For
this to work properly, it is expected that you have installed
- at least the "base21" and "etc21" distribution sets.
+ at least the "base22" and "etc22" distribution sets.
-Congratulations, you have successfully installed OpenBSD 2.1. When you
+Congratulations, you have successfully installed OpenBSD 2.2. 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 OpenBSD 2.1 distribution might need to be
+Some of the files in the OpenBSD 2.2 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/powerpc/upgrade b/distrib/notes/powerpc/upgrade
index 59718199115..3951aa129c0 100644
--- a/distrib/notes/powerpc/upgrade
+++ b/distrib/notes/powerpc/upgrade
@@ -122,7 +122,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 "upgr20" floppy from
- the floppy drive, and replace it with the OpenBSD 2.1
+ the floppy drive, and replace it with the OpenBSD 2.2
kernel-copy floppy that you previously booted from. Reboot
with that floppy.
@@ -151,10 +151,10 @@ 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 OpenBSD 2.1.
+Your system has now been upgraded to OpenBSD 2.2.
After a new kernel has been copied to your hard disk, your
- machine is a complete OpenBSD 2.1 system. However, that
+ machine is a complete OpenBSD 2.2 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.
diff --git a/distrib/notes/powerpc/whatis b/distrib/notes/powerpc/whatis
index fcad275a665..bf49fe34099 100644
--- a/distrib/notes/powerpc/whatis
+++ b/distrib/notes/powerpc/whatis
@@ -1,2 +1,2 @@
-For the powerpc, OpenBSD 2.1 is a new release of our existing code. This
+For the powerpc, OpenBSD 2.2 is a new release of our existing code. This
port is not completely reliable or fast.
diff --git a/distrib/notes/powerpc/xfer b/distrib/notes/powerpc/xfer
index 5cf0dbceaf2..9739e396c12 100644
--- a/distrib/notes/powerpc/xfer
+++ b/distrib/notes/powerpc/xfer
@@ -47,14 +47,14 @@ following:
(If you can't figure it out, ask your system administrator.)
In the above example, "<dist_directories>" are the
distribution sets' directories, for the distribution sets you
- wish to place on the tape. For instance, to put the "base21"
- and "etc21" distributions on tape (in order to do the absolute
+ wish to place on the tape. For instance, to put the "base22"
+ and "etc22" distributions on tape (in order to do the absolute
minimum installation to a new disk), you would do the
following:
cd .../1.2 # the top of the tree
cd powerpc/
- tar cf <tape_device> base21 etc21
+ tar cf <tape_device> base22 etc22
(Note that you still need to fill in "<tape_device>" in the
example.)
@@ -104,7 +104,7 @@ following:
Place the distribution sets you wish to upgrade somewhere in
your current file system tree. At a bare minimum, you must
upgrade the "base" binary distribution, and so must put the
- "base21" set somewhere in your file system. If you wish,
+ "base22" set somewhere in your file system. If you wish,
you can do the other sets, as well, but you should NOT upgrade
the "etc" distribution; the "etc" distribution contains system
configuration files that you should review and update by hand.
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index cc8c6ba0c5e..c928fab9c22 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,15 +1,15 @@
-The sparc-specific portion of the OpenBSD 2.1 release is found in the
+The sparc-specific portion of the OpenBSD 2.2 release is found in the
"sparc" subdirectory of the distribution. That subdirectory is organized
as follows:
-.../2.1/sparc/
+.../2.2/sparc/
INSTALL.sparc Installation notes; this file
- kc21.fs The sparc boot floppy; see below.
- inst21.fs The sparc installation floppy; see below.
- upgr21.fs The sparc upgrade floppy; see below.
- miniroot21.fs The sparc miniroot filesystem; see below.
- floppy21.fs The sparc compressed ramdisk boot floppy
+ kc22.fs The sparc boot floppy; see below.
+ inst22.fs The sparc installation floppy; see below.
+ upgr22.fs The sparc upgrade floppy; see below.
+ miniroot22.fs The sparc miniroot filesystem; see below.
+ floppy22.fs The sparc compressed ramdisk boot floppy
*.gz sparc binary distribution sets;
see below.
@@ -29,18 +29,18 @@ Please note that there are multiple bootable images and kernels, intended
to allow installing OpenBSD/sparc in a variety of situations without
requiring a pre-existing working operating system.
-The "kc21.fs" image is a bootable floppy image, which is used in conjunction
-with "inst21.fs" or "upgr21.fs", to allow installing or upgrading systems
+The "kc22.fs" image is a bootable floppy image, which is used in conjunction
+with "inst22.fs" or "upgr22.fs", to allow installing or upgrading systems
with supported floppy disk drives (not Sun4m at this time).
-The "miniroot21.fs" is a small bootable root filesystem that can be used
+The "miniroot22.fs" is a small bootable root filesystem that can be used
for installtion or upgrade where there is some means to copy the miniroot
image into a swap or unused partition on the system, and also for diskless
or netbooting. This can be convenient if you have a exsting installation
of OpenBSD, NetBSD, SunOS, or Solaris and wish to test or upgrade the
existing system to OpenBSD.
-The "floppy21.fs" is a new bootable floppy image, with contents similar
+The "floppy22.fs" is a new bootable floppy image, with contents similar
to a miniroot stored in a compressed kernel with pre-loaded ramdisk. As
of release time, this version has not received adequate testing and may
not work reliably on many systems, but is provided as a convenience for
@@ -57,43 +57,43 @@ Sun bootblocks require a separate kernel image and root filesystem.
Bootable installation/upgrade floppies:
- kc21.fs
+ kc22.fs
This disk is bootable, and only contains the boot loader and
kernel.
- inst21.fs
+ inst22.fs
This disk contains an installation file system, and has enough
utilities on board to prepare your hard disk drive for OpenBSD.
- upgr21.fs
+ upgr22.fs
This disk contains a file system, and has holds the utilities
needed in order to upgrade an existing OpenBSD (or NetBSD) system
- to a minimal working OpenBSD 2.1 system.
+ to a minimal working OpenBSD 2.2 system.
- floppy21.fs
+ floppy22.fs
This disk contains a compressed ramdisk filesystem, and holds
- all utilities needed to install or upgrade to OpenBSD 2.1
+ all utilities needed to install or upgrade to OpenBSD 2.2
- miniroot21.fs
+ miniroot22.fs
This is a miniroot filesystem image which can be copied to the
swap partition of an existing OpenBSD, NetBSD, SunOS, or Solaris
- installation to allow upgrading to OpenBSD 2.1
+ installation to allow upgrading to OpenBSD 2.2
The OpenBSD/sparc binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the sparc. There are seven binary
+comprise the OpenBSD 2.2 release for the sparc. There are seven binary
distribution sets. These binary distribution sets can be found in
-"sparc" subdirectory of the OpenBSD 2.1 distribution tree, and are as
+"sparc" subdirectory of the OpenBSD 2.2 distribution tree, and are as
follows:
- base21 The OpenBSD/sparc 2.1 base binary distribution. You
+ base22 The OpenBSD/sparc 2.2 base binary distribution. You
MUST install this distribution set. It contains 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.
[ 13.1M gzipped, 41.7M uncompressed ]
- etc21 This distribution set contains the system configuration
+ etc22 This distribution set contains the system configuration
files that reside in /etc and in several other places.
This set MUST be installed if you are installing the
system from scratch, but should NOT be used if you are
@@ -102,7 +102,7 @@ follows:
configuration files by hand.)
[ 95K gzipped, 460K uncompressed ]
- comp21 The OpenBSD/sparc Compiler tools. All of the tools
+ comp22 The OpenBSD/sparc Compiler tools. All of the tools
relating to C, C++, and FORTRAN.
This set includes the system include files
(/usr/include), the linker, the compiler tool chain,
@@ -113,22 +113,22 @@ follows:
call and library manual pages.
[ 8.7M gzipped, 28.8M uncompressed ]
- game21 This set includes the games and their manual pages.
+ game22 This set includes the games and their manual pages.
[ 2.9M gzipped, 7.3M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 2.5M gzipped, 9.4M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.8M gzipped, 6.2M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 1.0M gzipped, 3.9M uncompressed ]
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index 8146c9ecd04..6607af6ec53 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -1,11 +1,11 @@
-OpenBSD/sparc 2.1 runs on the following classes of machines:
+OpenBSD/sparc 2.2 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)
- sun4m (e.g. sparc classic, 4, 5, 10, and 20) *** See Notes Below
- faithful clones of the above Sun systems (e.g. Integrix)
-OpenBSD/sparc 2.1 does NOT run on these machines (yet):
+OpenBSD/sparc 2.2 does NOT run on these machines (yet):
- Sun 4/400 -- Lacking support for the I/O cache, and related
ethernet problems.
- sun4m 4/6XX (e.g Sparcserver 600MP) -- Different registers (auxio
@@ -82,7 +82,7 @@ about:
*** Note: sun4m and general sparc caveats
-As of of the OpenBSD 2.1 release there are still some outstanding problems
+As of of the OpenBSD 2.2 release there are still some outstanding problems
with OpenBSD on the various Sparc architectures. The sun4m architecture,
particularly the Viking/SuperSPARC implementations, is probably the least
stable and is also lacking useful floppy/audio support.
@@ -94,7 +94,7 @@ GENERIC is your best bet for a stable sun4m kernel.
There are a number of people actively working on improving the stability
of OpenBSD/sparc in the sun4m area. If you have problems with the
-OpenBSD 2.1 kernel in this distribution, please visit the OpenBSD web
+OpenBSD 2.2 kernel in this distribution, please visit the OpenBSD web
page (http://www.openbsd.org) and the mailing lists to review the current
status and check for updates.
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 64096c496d0..0c9bef18961 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -45,8 +45,8 @@ accomplish the same thing, but the install/upgrade scripts and procedures
are quite different between the old and new version.
The other difference bewtween the the two forms are in their bootblocks,
-and filesystems. The "floppy21.fs" image is the compressed ramdisk form,
-the "kc21.fs" paired with either "inst21.fs" or "upgr21.fs" comprise a
+and filesystems. The "floppy22.fs" image is the compressed ramdisk form,
+the "kc22.fs" paired with either "inst22.fs" or "upgr22.fs" comprise a
bootable kernel floppy and associated install/upgrade filesystem floppy.
The CD-ROM, miniroot and netboot install scripts are essentially the
@@ -334,11 +334,11 @@ may be a better option.
ftp if you are using a proxy.
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an ftp server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The ftp directory holding the distribution sets.
- The default value of pub/OpenBSD/2.1/sparc
+ The default value of pub/OpenBSD/2.2/sparc
is almost always correct.
5) The login and password for the ftp account.
The default will be correct unless you are
@@ -357,7 +357,7 @@ may be a better option.
(assuming you have a proxy available to use).
3) The IP address (or hostname if you enabled
DNS earlier in the install) of an http server
- carrying the OpenBSD 2.1 distribution.
+ carrying the OpenBSD 2.2 distribution.
If you don't know, just hit return when
asked if you want to see a list of such hosts.
4) The directory holding the distribution sets.
@@ -401,7 +401,7 @@ may be a better option.
You will also have to provide the relative path to the
directory on the CD which holds the distribution, for the
- sparc this is "2.1/sparc".
+ sparc this is "2.2/sparc".
For instructions on how to complete the installation from
the CD-ROM distribution, see the section named "Common
@@ -493,7 +493,7 @@ may be a better option.
using, all the device nodes needed by the installed system will
be created for you and the file systems will be unmounted. For
this to work properly, it is expected that you have installed
- at least the "base21" and "etc21" distribution sets.
+ at least the "base22" and "etc22" distribution sets.
@@ -553,13 +553,13 @@ On version 2 OpenBOOT ROMs:
On sun4 systems, you may not need to specify the boot file, as
the OpenBSD boot blocks will look for "bsd" on the boot device by default.
-Congratulations, you have successfully installed OpenBSD 2.1. When you
+Congratulations, you have successfully installed OpenBSD 2.2. 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 OpenBSD 2.1 distribution might need to be
+Some of the files in the OpenBSD 2.2 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 will be running your OpenBSD
@@ -652,10 +652,10 @@ The installboot man page says to do something like this:
You can now extract the provided "*.tar.gz files onto your disk.
sunos# ls -FC
- base21.tar.gz etc21.tar.gz man21.tar.gz secr21.tar.gz
- comp21.tar.gz games21.tar.gz misc21.tar.gz text21.tar.gz
+ base22.tar.gz etc22.tar.gz man22.tar.gz secr22.tar.gz
+ comp22.tar.gz games22.tar.gz misc22.tar.gz text22.tar.gz
bsd bsd.scsi3
- sunos# gunzip < base21.tar.gz | (cd /mnt; gtar xvpf -)
+ sunos# gunzip < base22.tar.gz | (cd /mnt; gtar xvpf -)
[...] for each set
And finally copy an OpenBSD kernel (either bsd or bsd.scsi3) onto your disk.
@@ -734,7 +734,7 @@ handle corresponding to the root filesystem. If successful, the boot
rogram starts reading from the remote root filesystem in search of the
kernel which is then read into memory.
-You will want export the miniroot21.fs filesystem to the client. You
+You will want export the miniroot22.fs filesystem to the client. You
can dd this filesystem image to some spare partition, mount and export
tat partition or use tar to copy the contents to a more convenient spot.
diff --git a/distrib/notes/sparc/upgrade b/distrib/notes/sparc/upgrade
index 05563834835..900009c8c79 100644
--- a/distrib/notes/sparc/upgrade
+++ b/distrib/notes/sparc/upgrade
@@ -1,4 +1,4 @@
-To upgrade to OpenBSD 2.1 from a previous version start with the general
+To upgrade to OpenBSD 2.2 from a previous version start with the general
instructions in the section "Installing OpenBSD".
If you are upgrading with the miniroot or the new single floppy image,
@@ -6,7 +6,7 @@ select the (U)pdate option rather than the (I)nstall option at the prompt
in the inststall process.
If you are using the old multi-floppy installsyion procedure, use the
-"upgr21.fs" floppy rather than the "inst21.fs" floppy when prompted to
+"upgr22.fs" floppy rather than the "inst22.fs" floppy when prompted to
put in the filesystem diskette. When you arrive at the shell prompt,
run the "upgrade" script rather than "install" script.
diff --git a/distrib/notes/sparc/whatis b/distrib/notes/sparc/whatis
index 75645c329c7..9cfb85d4967 100644
--- a/distrib/notes/sparc/whatis
+++ b/distrib/notes/sparc/whatis
@@ -1,12 +1,12 @@
-OpenBSD/sparc 2.1 is brought to you by the same people who did the first
+OpenBSD/sparc 2.2 is brought to you by the same people who did the first
free BSD sparc port (based on Chris Torek's 4.4BSD work). Many more sparc
models and devices are now supported.
-In addition to the providing SunOS 4.1 compatibility, OpenBSD 2.1 will
+In addition to the providing SunOS 4.1 compatibility, OpenBSD 2.2 will
also run some number of SunOS 5 (SVR4) executables in binary emulation mode.
OpenBSD/sparc has gone though several development cycles since it's origin,
-but the OpenBSD/sparc 2.1 release should be considered as "under active
+but the OpenBSD/sparc 2.2 release should be considered as "under active
development" rather than a production ready release. There are still known
problems with the kernel and missing support for some common devices.
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index d3053da3f6d..62025bdcf5d 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -40,7 +40,7 @@ Creating a bootable floppy disk using DOS/Windows:
First you need to get access to the OpenBSD Bootable floppy
images. If you can access the CD-ROM distribution under DOS
- the bootable disks are in the 2.1/sparc directory, otherwise
+ the bootable disks are in the 2.2/sparc directory, otherwise
you you will have to download them from one of the OpenBSD
ftp or http mirror sites, using ftp or a web-viewer. In either
case, take care to do "binary" transfers, since these are
@@ -74,7 +74,7 @@ Creating a bootable floppy disk using SunOS or other Un*x-like system:
Next, use the dd(1) utility to copy the file to the floppy drive.
Under SunOS, the comand would be:
- dd if=floppy21.fs of=/dev/rfdc0 bs=36b
+ dd if=floppy22.fs of=/dev/rfdc0 bs=36b
If you are using someting other than SunOS, you may have to adapt
this to conform to local naming conventions for the floppy and
@@ -113,9 +113,9 @@ Creating a bootable hard disk using SunOS or other Un*x-like system:
Use the dd(1) utility to copy the file to the floppy drive.
Under SunOS, the comand would be:
- dd if=floppy21.fs of=/dev/rsd0b bs=36b
+ dd if=floppy22.fs of=/dev/rsd0b bs=36b
- or -
- dd if=miniroot21.fs of=/dev/rsd0b bs=36b
+ dd if=miniroot22.fs of=/dev/rsd0b bs=36b
The blocksize is arbitrary as long as it's a multiple of 512-bytes
and within the maximum supported by the driver, i.e. bs=126b may
@@ -140,7 +140,7 @@ Creating a bootable hard disk using SunOS or other Un*x-like system:
To copy the floppy image to the whole disk, overwriting labels:
- dd if=floppy21.fs of=/dev/rsdXc bs=36b
+ dd if=floppy22.fs of=/dev/rsdXc bs=36b
Two notes - X should be replaced by the unit number of the target
disk, which is most likely *not* the disk/paritition that's your
@@ -159,13 +159,13 @@ Creating a bootable hard disk using SunOS or other Un*x-like system:
To copy the flopy image to the hard disk, preserving SunOS,
Solaris NetBSD or OpenBSD labels:
- dd if=floppy21.fs of=/dev/rsdXc bs=1b skip=1 seek=1
+ dd if=floppy22.fs of=/dev/rsdXc bs=1b skip=1 seek=1
You need to be sure that your version of dd(1) supports the
skip and seek operands, otherwise you can try a technique like:
dd if=/dev/rsdXc of=/tmp/label bs=1b count=1
- dd if=floppy21.fs of=/dev/rsdXc bs=36b
+ dd if=floppy22.fs of=/dev/rsdXc bs=36b
dd if=/tmp/label of=/dev/rsdXc bs=1b count=1
In either case, you've created a situation where the disklabel
@@ -217,7 +217,7 @@ To install or upgrade OpenBSD using a tape, you need to do the following:
#! /bin/sh
tape=/dev/nrst0
mt -f ${tape} rewind
- for file in base21 etc21 comp21 game21 man21 misc21 text21
+ for file in base22 etc22 comp22 game22 man22 misc22 text22
do
dd if=${file}.tar.gz of=${tape}
done
@@ -228,7 +228,7 @@ To install or upgrade OpenBSD using a tape, you need to do the following:
And then:
- cd .../2.1/sparc
+ cd .../2.2/sparc
sh -x /tmp/maketape
@@ -275,7 +275,7 @@ following:
Place the distribution sets you wish to upgrade somewhere in
your current file system tree. At a bare minimum, you must
upgrade the "base" binary distribution, and so must put the
- "base21" set somewhere in your file system. If you wish,
+ "base22" set somewhere in your file system. If you wish,
you can do the other sets, as well, but you should NOT upgrade
the "etc" distribution; the "etc" distribution contains system
configuration files that you should review and update by hand.
diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index 78c3c53738d..91ede34a891 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -1,8 +1,8 @@
-The sun3-specific portion of the OpenBSD 2.1 release is found in the
+The sun3-specific portion of the OpenBSD 2.2 release is found in the
"sun3" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../2.1/sun3/
+.../2.2/sun3/
INSTALL.sun3 Installation notes; this file.
install/ Boot programs, a GENERIC kernel,
@@ -40,12 +40,12 @@ to support installation "over the network". See the section "Getting
the OpenBSD System onto Useful Media" for instructions on either method.
The OpenBSD/sun3 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.1 release for the sun3. There are seven binary
+comprise the OpenBSD 2.2 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 OpenBSD 2.1 distribution tree, and are as follows:
+the OpenBSD 2.2 distribution tree, and are as follows:
- base21 The OpenBSD/sun3 2.1 base binary distribution. You
+ base22 The OpenBSD/sun3 2.2 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -53,7 +53,7 @@ the OpenBSD 2.1 distribution tree, and are as follows:
everything described below.
[ 7.2M gzipped, 19M uncompressed ]
- comp21 The OpenBSD/sun3 Compiler tools. All of the tools
+ comp22 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
@@ -63,7 +63,7 @@ the OpenBSD 2.1 distribution tree, and are as follows:
call and library manual pages.
[ 4.6M gzipped, 14.7M uncompressed ]
- etc21 This distribution set contains the system configuration
+ etc22 This distribution set contains the system configuration
files that reside in /etc and in several other places.
This set MUST be installed if you are installing the
system from scratch, but should NOT be used if you are
@@ -72,22 +72,22 @@ the OpenBSD 2.1 distribution tree, and are as follows:
configuration files by hand.)
[ 64K gzipped, 348K uncompressed ]
- games21 This set includes the games and their manual pages.
+ games22 This set includes the games and their manual pages.
[ 2.8M gzipped, 6.8M uncompressed ]
- man21 This set includes all of the manual pages for the
+ man22 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 850K gzipped, 3.3M uncompressed ]
- misc21 This set includes the system dictionaries (which are
+ misc22 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.8M gzipped, 6.5M uncompressed ]
- text21 This set includes OpenBSD's text processing tools,
+ text22 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 770K gzipped, 2.8M uncompressed ]