diff options
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/notes/hp300/install | 4 | ||||
| -rw-r--r-- | distrib/notes/m4.common | 8 | ||||
| -rw-r--r-- | distrib/notes/mvme68k/install | 4 | ||||
| -rw-r--r-- | distrib/notes/sparc/install | 6 | ||||
| -rw-r--r-- | distrib/notes/sparc/xfer | 18 | ||||
| -rw-r--r-- | distrib/notes/sparc64/install | 6 | ||||
| -rw-r--r-- | distrib/notes/sparc64/xfer | 12 | ||||
| -rw-r--r-- | distrib/notes/vax/install | 4 |
8 files changed, 25 insertions, 37 deletions
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install index 06b74574a2d..aab505a9eea 100644 --- a/distrib/notes/hp300/install +++ b/distrib/notes/hp300/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.22 2002/06/09 05:53:54 todd Exp $ +dnl $OpenBSD: install,v 1.23 2002/12/30 11:13:01 miod Exp $ OpenBSDInstallPrelude dnl No extra line, this has to stick to the geometry notes paragraph. The file `HP-IB.geometry' has geometry information for several HP-IB @@ -137,7 +137,7 @@ OpenBSDNFSInstall OpenBSDDISKInstall({:-"hdN" or -:},{:-only -:}) -OpenBSDCommonFS +OpenBSDCommonFS(NFS) OpenBSDCommonURL diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common index df4ffc4a3f8..b1dd64f8ed4 100644 --- a/distrib/notes/m4.common +++ b/distrib/notes/m4.common @@ -1,5 +1,5 @@ dnl -dnl $OpenBSD: m4.common,v 1.39 2002/11/07 22:38:36 mickey Exp $ +dnl $OpenBSD: m4.common,v 1.40 2002/12/30 11:12:58 miod Exp $ dnl dnl a simple MACHINE->MACHINE_ARCH converter. define(`MACHINE_ARCH', @@ -543,11 +543,13 @@ define({:-OpenBSDDISKInstall-:}, For instructions on how to complete the installation from the a local disk partition, see the next section.-:})dnl dnl +dnl For arches where you can install from NFS, $1 should be set to "NFS", +dnl otherwise there should be no parameter. define({:-OpenBSDCommonFS-:}, {:- Common file system installations: The following instructions are common to installations - from local disk partitions, NFS mounted directories and - CD-ROMs. + from mounted disk partitions{:--:}ifelse(X$1,XNFS,{:-, NFS mounted directories and + CD-ROMs-:},{:- and CD-ROMs-:}). A list of available distribution sets will be listed. You may individually select distribution sets to install diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install index 650f1a00f1f..8dbe5ff6cb2 100644 --- a/distrib/notes/mvme68k/install +++ b/distrib/notes/mvme68k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.16 2002/04/17 23:32:09 miod Exp $ +dnl $OpenBSD: install,v 1.17 2002/12/30 11:13:01 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -148,7 +148,7 @@ OpenBSDNFSInstall OpenBSDDISKInstall(,{:-only -:}) -OpenBSDCommonFS +OpenBSDCommonFS(NFS) OpenBSDCommonURL diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install index 15a3400f0ef..eed38c3d22e 100644 --- a/distrib/notes/sparc/install +++ b/distrib/notes/sparc/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.54 2002/07/25 19:29:32 miod Exp $ +dnl $OpenBSD: install,v 1.55 2002/12/30 11:13:01 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -205,7 +205,7 @@ OpenBSDInstallPart4 OpenBSDInstallPart5(sd0) -OpenBSDInstallNet({:-CD-ROM, NFS, -:},nofloppy) +OpenBSDInstallNet({:-CD-ROM, -:},nofloppy) OpenBSDFTPInstall @@ -215,8 +215,6 @@ OpenBSDTAPEInstall(3) OpenBSDCDROMInstall -OpenBSDNFSInstall - OpenBSDDISKInstall(,{:-only -:}) OpenBSDCommonFS diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer index 14545705da9..cde28b8b4ae 100644 --- a/distrib/notes/sparc/xfer +++ b/distrib/notes/sparc/xfer @@ -1,11 +1,10 @@ -dnl $OpenBSD: xfer,v 1.33 2002/07/25 19:29:32 miod Exp $ +dnl $OpenBSD: xfer,v 1.34 2002/12/30 11:13:01 miod Exp $ Installation is supported from several media types, including: CD-ROM dnl put back after 3.2 dnl FFS partitions Tape - Remote NFS partition FTP HTTP @@ -21,15 +20,15 @@ you will need to do some setup work to prepare a bootable image, either a floppy, hard drive, tape, or compatible net boot server. In addition to the bootable image, you also need to consider how to -access the binary distribution sets to actually install the system. If -you have the OpenBSD CD-ROM distribution you can either access the -CD-ROM directly from the bootable image or remotely mounted on another -system via NFS. +access the binary distribution sets to actually install the system. Although you can access the distribution sets directly from the CD-ROM or from one of the FTP mirrors over the internet, you may wish to transfer -the sets to a local FTP or NFS server, or copy them to a partition on -the target system's disk or onto a SCSI tape. +dnl when upgrades are back, change +the sets to a local FTP server, or copy them onto a SCSI tape. +dnl back to this: +dnl the sets to a local FTP server, or copy them to a partition on the target +dnl system's disk or onto a SCSI tape. OpenBSDXferFloppyFromDOS @@ -144,8 +143,5 @@ OpenBSDXferPrelude OpenBSDXferBootTape(xbase xfont xserv xshare,bsd.rd obs=8k conv=sync,boot obs=8k conv=sync) -dnl OpenBSDXferNFS -OpenBSDXferNFS(noupgrade) dnl put back after 3.2 -dnl dnl OpenBSDXferFFS diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install index cd14529e577..125b40adcba 100644 --- a/distrib/notes/sparc64/install +++ b/distrib/notes/sparc64/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.27 2002/10/03 00:19:49 miod Exp $ +dnl $OpenBSD: install,v 1.28 2002/12/30 11:13:01 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -134,7 +134,7 @@ OpenBSDInstallPart4 OpenBSDInstallPart5(sd0) -OpenBSDInstallNet({:-CD-ROM, NFS, -:},nofloppy) +OpenBSDInstallNet({:-CD-ROM, -:},nofloppy) OpenBSDFTPInstall @@ -144,8 +144,6 @@ OpenBSDTAPEInstall OpenBSDCDROMInstall -OpenBSDNFSInstall - OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:}) OpenBSDCommonFS diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer index dac30917759..cf96f01090a 100644 --- a/distrib/notes/sparc64/xfer +++ b/distrib/notes/sparc64/xfer @@ -1,10 +1,9 @@ -dnl $OpenBSD: xfer,v 1.17 2002/10/03 00:19:49 miod Exp $ +dnl $OpenBSD: xfer,v 1.18 2002/12/30 11:13:01 miod Exp $ Installation is supported from several media types, including: CD-ROM (NOT supported if booting from floppy) FFS partitions Tape - Remote NFS partition (NOT supported if booting from floppy) FTP HTTP @@ -16,14 +15,11 @@ a floppy, hard drive, or compatible net boot server. In addition to the bootable image, you also need to consider how to access the binary distribution sets to actually install the system. -If you have the OpenBSD CD-ROM distribution you can either access the -CD-ROM directly from the bootable image or remotely mounted on another -system via NFS. Although you can access the distribution sets directly from the CD-ROM or from one of the FTP mirrors over the internet, you may wish to transfer -the sets to a local FTP or NFS server, or copy them to a partition on -the target system's disk. +the sets to a local FTP server, or copy them to a partition on the target +system's disk. OpenBSDXferFloppyFromDOS @@ -93,6 +89,4 @@ OpenBSDXferPrelude OpenBSDXferBareTape(xbase xfont xserv xshare) -OpenBSDXferNFS - OpenBSDXferFFS diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install index 05e267857b0..fff78ff3b59 100644 --- a/distrib/notes/vax/install +++ b/distrib/notes/vax/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.14 2002/09/23 17:09:11 hugh Exp $ +dnl $OpenBSD: install,v 1.15 2002/12/30 11:13:01 miod Exp $ OpenBSDInstallPrelude For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via @@ -119,7 +119,7 @@ OpenBSDNFSInstall OpenBSDDISKInstall(,{:-only-:}) -OpenBSDCommonFS +OpenBSDCommonFS(NFS) OpenBSDCommonURL |