diff options
-rw-r--r-- | distrib/notes/m4.common | 12 | ||||
-rw-r--r-- | distrib/notes/sparc64/contents | 4 | ||||
-rw-r--r-- | distrib/notes/sparc64/install | 6 | ||||
-rw-r--r-- | distrib/notes/sparc64/upgrade | 13 | ||||
-rw-r--r-- | distrib/notes/sparc64/xfer | 10 |
5 files changed, 24 insertions, 21 deletions
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common index 8209fefda79..3850c45e846 100644 --- a/distrib/notes/m4.common +++ b/distrib/notes/m4.common @@ -1,5 +1,5 @@ dnl -dnl $OpenBSD: m4.common,v 1.28 2001/12/02 00:15:42 miod Exp $ +dnl $OpenBSD: m4.common,v 1.29 2002/03/23 23:58:48 miod Exp $ dnl dnl simulate an include path with a macro 'includeit'. define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl @@ -94,7 +94,7 @@ define({:-OpenBSDcomp-:}, call and library manual pages.showsize($1,$2)-:})dnl dnl dnl -dnl OpenBSDetc( compressed size, uncompressed size ) +dnl OpenBSDetc( compressed size, uncompressed size [, noupgrade]) dnl Describes etcXX.tgz. dnl define({:-OpenBSDetc-:}, @@ -102,10 +102,10 @@ define({:-OpenBSDetc-:}, 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 - upgrading. (If you are upgrading, it's recommended that + upgrading.{:--:}ifelse(X$3,X,{:-(If you are upgrading, it's recommended that you get a copy of this set and CAREFULLY upgrade your configuration files by hand, see the section named "Upgrading - a previously-installed OpenBSD System" below.)showsize($1,$2)-:})dnl + a previously-installed OpenBSD System" below.)-:})showsize($1,$2)-:})dnl dnl dnl dnl OpenBSDgame( compressed size, uncompressed size ) @@ -175,10 +175,10 @@ define({:-OpenBSDcdrom-:}, 2.88mb floppy image that contains almost all OpenBSD drivers; see below.-:})dnl dnl -dnl OpenBSDfloppydesc(number of floppies, Article, optional plural 's') +dnl OpenBSDfloppydesc(number of floppies, Article, plural) dnl dnl Describe what the boot floppy/ies contain and how they may be used. -dnl Use as: OpenBSDfloppydesc(single, The) or OpenBSDfloppydesc(three, Each, s) +dnl Use as: OpenBSDfloppydesc(single,The) or OpenBSDfloppydesc(three,Each,s) define({:-OpenBSDfloppydesc-:}, {:-Bootable installation/upgrade floppy image$3: diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents index 4360e3241e2..8aeed7d911a 100644 --- a/distrib/notes/sparc64/contents +++ b/distrib/notes/sparc64/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.18 2002/02/07 08:57:28 miod Exp $ +dnl $OpenBSD: contents,v 1.19 2002/03/23 23:58:50 miod Exp $ TopPart OpenBSDminiroot @@ -54,7 +54,7 @@ OpenBSDbase(25.0,73.6,shared) OpenBSDcomp(21.2,81.0,shared) -OpenBSDetc(1.1,3.3) +OpenBSDetc(1.1,3.3,noupgrade) OpenBSDgame(2.9,6.6) diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install index df615dccbff..a6eaba863bb 100644 --- a/distrib/notes/sparc64/install +++ b/distrib/notes/sparc64/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.18 2002/03/23 23:29:16 krw Exp $ +dnl $OpenBSD: install,v 1.19 2002/03/23 23:58:50 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -401,7 +401,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/sparc64/upgrade b/distrib/notes/sparc64/upgrade index 8ed2cf177d8..4343574d566 100644 --- a/distrib/notes/sparc64/upgrade +++ b/distrib/notes/sparc64/upgrade @@ -1,7 +1,6 @@ -dnl $OpenBSD: upgrade,v 1.8 2002/02/07 08:57:28 miod Exp $ -Since OpenBSD OSREV is the first release for MACHINE systems, upgrades -are not expected. -If you have been using an old OpenBSD/MACHINE snapshot, you can follow the -following instructions. - -OpenBSDUpgrade({:-CDROM, the miniroot, or the installation floppy-:}) +dnl $OpenBSD: upgrade,v 1.9 2002/03/23 23:58:50 miod Exp $ +Due to the youth of the MACHINE port, upgrades to OpenBSD OSREV are not +supported. +You are strongly advised to reinstall your existing machines from scratch. +dnl +dnl OpenBSDUpgrade({:-CDROM, the miniroot, or the installation floppy-:}) diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer index 0ce309b39ab..fc829ff9496 100644 --- a/distrib/notes/sparc64/xfer +++ b/distrib/notes/sparc64/xfer @@ -1,8 +1,9 @@ -dnl $OpenBSD: xfer,v 1.13 2002/02/07 08:57:28 miod Exp $ +dnl $OpenBSD: xfer,v 1.14 2002/03/23 23:58:50 miod Exp $ Installation is supported from several media types, including: CD-ROM (NOT supported if booting from floppy) - FFS partitions +dnl put back for 3.2 +dnl FFS partitions Tape Remote NFS partition (NOT supported if booting from floppy) FTP @@ -124,5 +125,6 @@ OpenBSDXferPrelude OpenBSDXferBareTape(xbase xfont xserv xshare) OpenBSDXferNFS - -OpenBSDXferFFS +dnl put back for 3.2 +dnl +dnl OpenBSDXferFFS |