Due to changes having already occured, and more being cooked at this

very moment, OpenBSD/sparc installation media will not allow upgrades
to 3.2.

5 files changed, 52 insertions, 15 deletions

diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index f8f63f4d4b8..d675faafa5d 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.36 2002/07/04 18:06:45 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.37 2002/07/25 19:29:29 miod Exp $
 dnl
 dnl simulate an include path with a macro 'includeit'.
 define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
@@ -848,7 +848,7 @@ ifelse(X$4,X,,{:-		dd of=${TAPE} if=$4
 
 	Note that, when installing, the tape can be write-protected
 	(i.e. read-only).-:})dnl
-dnl
+dnl OpenBSDXferNFS [(noupgrade)]
 define({:-OpenBSDXferNFS-:},
 {:-To install OpenBSD using a remote partition, mounted via
 NFS, you must do the following:
@@ -877,11 +877,11 @@ NFS, you must do the following:
 
 	Once the NFS server is set up properly and you have the
 	information mentioned above, you can proceed to the next
-	step in the installation or upgrade process.  If you're
+	step in the installation ifelse(X$1,X,{:-or upgrade -:})process.ifelse(X$1,X,,{:-  If you're
 	installing OpenBSD from scratch, go to the section on
 	preparing your hard disk, below.  If you're upgrading an
 	existing installation, go directly to the section on
-	upgrading.-:})dnl
+	upgrading.-:})-:})dnl
 dnl
 define({:-OpenBSDXferFFS-:},
 {:-If you are upgrading OpenBSD, you also have the option of installing
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 38fb730c4ec..dca438a31d5 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,10 +1,13 @@
+dnl	$OpenBSD: contents,v 1.41 2002/07/25 19:29:32 miod Exp $
 TopPart
 
 OpenBSDminiroot
 				It can be copied to the swap partition of
 				an existing OpenBSD, NetBSD, Linux, SunOS,
 				or Solaris installation to allow installing
-				or upgrading to OpenBSD OSREV
+dnl uncomment when upgrades are available again
+dnl				or upgrading to OpenBSD OSREV.
+				OpenBSD OSREV.
 
 OpenBSDfloppy
 
@@ -32,7 +35,16 @@ The kernel and boot images are provided for net booting installations.
 While the OpenBSD bootblocks will work with the provided miniroot images,
 Sun bootblocks require a separate kernel image and root filesystem.
 
-OpenBSDfloppydesc(single,The)
+dnl uncomment when upgrades are available again...
+dnl OpenBSDfloppydesc(single,The)
+dnl ... and remove this paragraph:
+Bootable installation floppy image:
+
+	The single floppy image can be copied to a floppy using rawrite.exe,
+	ntrw.exe or `dd', as described later in this document.
+	The floppy image is a bootable install floppy which can be used
+	to install OpenBSD to the current version.
+	It is also useful for maintenance and disaster recovery.
 
 DistributionDescription(ten)
 
@@ -40,7 +52,8 @@ OpenBSDbase(25.3,76.9,shared)
 
 OpenBSDcomp(18.2,56.4,shared)
 
-OpenBSDetc(1.2,3.9)
+dnl OpenBSDetc(1.2,3.9)
+OpenBSDetc(1.2,3.9,noupgrade)
 
 OpenBSDgame(2.9,6.9)
 
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 177ae470474..15a3400f0ef 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.53 2002/06/09 05:53:54 todd Exp $
+dnl	$OpenBSD: install,v 1.54 2002/07/25 19:29:32 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -186,7 +186,20 @@ OpenBSDBootMsgs
 	you should choose the terminal type from amongst those listed.
 	(If your terminal type is xterm, just use vt100).
 
-OpenBSDInstallPart3
+dnl put this back for 3.3
+dnl OpenBSDInstallPart3
+	After entering the terminal type you will be asked whether you
+	wish to do an "(I)nstall".  Enter 'I' for a fresh installation.
+	Note that you cannot upgrade a previous OpenBSD installation
+	to 3.2.
+
+	You will be presented with a welcome message and asked if
+	you really want to continue. Assuming you answered yes, the
+	install program will then tell you which disks of that type
+	it can install on, and ask you which it should use.  The name
+	of the disk is typically "sd0" for SCSI drives.
+	Reply with the name of your disk.
+dnl end put this back
 
 OpenBSDInstallPart4
 
@@ -497,7 +510,9 @@ filesystem for `/usr' with your diskless setup, make sure the "./usr" base
 files in base{:--:}OSrev.tgz end up in the correct location. One way to do this is
 to temporarily use a loopback mount on the server, re-routing <root>/usr to
 your server's exported OpenBSD "/usr" directory. Also put the kernel and
-the install/upgrade scripts into the root directory.
+dnl put back after 3.2
+dnl the install/upgrade scripts into the root directory.
+the install script into the root directory.
 
 A few configuration files need to be edited:
 
diff --git a/distrib/notes/sparc/upgrade b/distrib/notes/sparc/upgrade
index 945a0cf1d00..4a6c06c1be2 100644
--- a/distrib/notes/sparc/upgrade
+++ b/distrib/notes/sparc/upgrade
@@ -1 +1,6 @@
-OpenBSDUpgrade({:-the CD-ROM, the miniroot, or the installation floppy-:})
+dnl	$OpenBSD: upgrade,v 1.15 2002/07/25 19:29:32 miod Exp $
+Due to important changes affecting the MACHINE port since the previous
+release, upgrades to OpenBSD OSREV are not supported.
+You are strongly advised to reinstall your existing machines from scratch.
+dnl
+dnl OpenBSDUpgrade({:-the CD-ROM, the miniroot, or the installation floppy-:})
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index 53ad8768843..14545705da9 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -1,7 +1,9 @@
+dnl	$OpenBSD: xfer,v 1.33 2002/07/25 19:29:32 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
-	FFS partitions
+dnl put back after 3.2
+dnl	FFS partitions
 	Tape
 	Remote NFS partition
 	FTP
@@ -142,6 +144,8 @@ OpenBSDXferPrelude
 
 OpenBSDXferBootTape(xbase xfont xserv xshare,bsd.rd obs=8k conv=sync,boot obs=8k conv=sync)
 
-OpenBSDXferNFS
-
-OpenBSDXferFFS
+dnl OpenBSDXferNFS
+OpenBSDXferNFS(noupgrade)
+dnl put back after 3.2
+dnl
+dnl OpenBSDXferFFS