diff options
Diffstat (limited to 'distrib')
50 files changed, 310 insertions, 309 deletions
diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL index b7264ab921c..325c16406ea 100644 --- a/distrib/notes/INSTALL +++ b/distrib/notes/INSTALL @@ -1,4 +1,4 @@ -dnl $OpenBSD: INSTALL,v 1.38 2004/03/16 08:24:59 jmc Exp $ +dnl $OpenBSD: INSTALL,v 1.39 2004/03/17 09:25:08 jmc Exp $ include(INCLUDE/../m4.common)dnl INSTALLATION NOTES for OpenBSD/MACHINE OSREV @@ -106,7 +106,7 @@ access to source code so that you can recompile pieces of the system. A few methods are provided. If you have an OpenBSD CD-ROM, the source code is provided. Otherwise, you can get the pieces over the Internet using -ANONCVS, CTM or FTP. For more information, see +ANONCVS, CTM, or FTP. For more information, see http://www.OpenBSD.org/anoncvs.html http://www.OpenBSD.org/ctm.html diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents index 5913cb5a083..8a6dadc92c8 100644 --- a/distrib/notes/alpha/contents +++ b/distrib/notes/alpha/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.31 2003/09/09 22:29:02 miod Exp $ +dnl $OpenBSD: contents,v 1.32 2004/03/17 09:25:09 jmc Exp $ TopPart OpenBSDfloppy @@ -11,7 +11,7 @@ dnl - AlphaStation 500, 600 - AXPpci33 based machines, including ``Noname'', UDB, Multia - EB164 based machines, including - PC164, 164SX and 164LX + PC164, 164SX, and 164LX - Personal Workstation (Miata) floppyB{:--:}OSrev.fs Another MACHINE boot and installation floppy; diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware index 1821ff01d43..50d3fbcd944 100644 --- a/distrib/notes/alpha/hardware +++ b/distrib/notes/alpha/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.39 2004/03/16 08:24:59 jmc Exp $ +dnl $OpenBSD: hardware,v 1.40 2004/03/17 09:25:09 jmc Exp $ OpenBSD/MACHINE OSREV 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 @@ -10,7 +10,7 @@ Supported hardware: chipset (only one processor on the DS20 will be used) Supported devices: Built-in serial and parallel ports. - Built-in DEC21143 ethernet. + Built-in DEC21143 Ethernet. Built-in ISP SCSI. Built-in IDE controller. Built-in USB should work, but has not been thoroughly @@ -24,7 +24,7 @@ Supported hardware: API UP1000 machines and other EV6 machines using the Irongate chipset Supported devices: Built-in serial and parallel ports. - Built-in DEC21040 ethernet. + Built-in DEC21040 Ethernet. Built-in IDE controller works, though there may be stability issues. Unsupported devices: @@ -38,7 +38,7 @@ Supported hardware: trying to install OpenBSD on them. Supported devices: Built-in serial and parallel ports. - Built-in DEC21043 ethernet. + Built-in DEC21043 Ethernet. Built-in ISP SCSI, when present (i.e. on ``au'' models). Built-in IDE controller. Most PCI devices (see below). @@ -67,7 +67,7 @@ Supported hardware: AlphaServer 800, 1000 and 1000A Supported devices: Built-in serial and parallel ports. - Built-in DEC21040 ethernet. + Built-in DEC21040 Ethernet. Built-in ISP SCSI. PCI graphics card (TGA or VGA compatible). Most PCI devices (see below). @@ -81,7 +81,7 @@ dnl uncomment when support is back on track dnl AlphaStation 500 and 600 dnl Supported devices: dnl Built-in serial and parallel ports. -dnl Built-in DEC21040 ethernet. +dnl Built-in DEC21040 Ethernet. dnl Built-in ISP SCSI. dnl PCI graphics card (TGA or VGA compatible). dnl Most PCI devices (see below). @@ -94,7 +94,7 @@ dnl AlphaStation 200, 250, 255 and 400 Supported devices: Built-in serial and parallel ports. - Built-in DEC21040 ethernet. + Built-in DEC21040 Ethernet. Built-in ISP SCSI. PCI graphics card (TGA or VGA compatible). Most PCI devices (see below). @@ -107,9 +107,9 @@ dnl AXPpci based machines (including ``Noname'', UDB, Multia) Supported devices: Built-in serial and parallel ports. - Built-in DEC21040 ethernet. + Built-in DEC21040 Ethernet. Built-in 53C810 SCSI (siop). - Built-in IDE controller. (though, will not boot from ide) + Built-in IDE controller. (will not boot from IDE, though) PCI graphics card (TGA or VGA compatible). Most PCI devices (see below). Some ISA devices (see below). @@ -120,9 +120,9 @@ dnl DEC 3000 models 300{,L,X,LX} Supported devices: Built-in serial ports. - Built-in LANCE ethernet. + Built-in LANCE Ethernet. Built-in SCSI (53C94). - TURBOchannel LANCE ethernet cards (PMAD-A). + TURBOchannel LANCE Ethernet cards (PMAD-A). TURBOchannel SCSI (53C94) (PMAZ-A). TURBOchannel DEFTA FDDI cards (PMAF-FA). Unsupported devices: @@ -133,9 +133,9 @@ dnl DEC 3000 models 400,500,500X,600,700,800,900 Supported devices: Built-in serial ports. - Built-in LANCE ethernet. + Built-in LANCE Ethernet. Built-in SCSI (53C94 or 53CF94-2). - TURBOchannel LANCE ethernet cards (PMAD-A). + TURBOchannel LANCE Ethernet cards (PMAD-A). TURBOchannel SCSI (53C94) (PMAZ-A). TURBOchannel DEFTA FDDI cards (PMAF-FA). Unsupported devices: @@ -156,7 +156,7 @@ dnl be disguised AlphaStation machines DEC 4000, 7000, and 10000 systems (FutureBus+ and XMIBus based) EB64+ based systems Samsung 164BX/UX (no SRM) - Multiprocessor alpha systems + Multiprocessor Alpha systems VME Alpha systems Supported Peripherals: diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install index a6e0a6da17d..858c9f0e0f5 100644 --- a/distrib/notes/alpha/install +++ b/distrib/notes/alpha/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.23 2004/03/16 08:24:59 jmc Exp $ +dnl $OpenBSD: install,v 1.24 2004/03/17 09:25:09 jmc Exp $ OpenBSDInstallPrelude dnl XXX document mopbooting from the SRM console. @@ -31,7 +31,7 @@ Booting from CD-ROM installation media: with DKA for a SCSI CD-ROM drive). If your drive shows up with a drive number with trailing zeros, you will want to ignore them (unless it is DKA0). For example, if your CD-ROM drive is listed - as DKA600, you want to use dka6 (device ID's are case + as DKA600, you want to use dka6 (device IDs are case insensitive). On all MACHINE computers but the TURBOchannel DEC 3000 series, @@ -65,7 +65,7 @@ OpenBSDBootMsgs installing from a non-serial console, the default of "vt220" is correct. If you are installing from a serial console you should choose the terminal type from amongst those listed. - (If your terminal type is xterm, just use vt220). + (If your terminal type is xterm, just use vt220.) OpenBSDInstallPart3({:- or "wd0" for IDE drives-:}) diff --git a/distrib/notes/alpha/prep b/distrib/notes/alpha/prep index 4f26b61ebb7..0409123befd 100644 --- a/distrib/notes/alpha/prep +++ b/distrib/notes/alpha/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.20 2003/09/06 22:22:42 miod Exp $ +dnl $OpenBSD: prep,v 1.21 2004/03/17 09:25:09 jmc Exp $ OpenBSD/MACHINE requires the SRM console. Some alphas come with the AlphaBIOS (also known as the ARC firmware on older machines) instead; this is what Windows NT uses. It is fairly simple to replace the AlphaBIOS @@ -6,7 +6,7 @@ with the SRM firmware. Switching your MACHINE to SRM console: Recent machines (such as the Miata and later models) have enough flash - rom space to carry both the AlphaBIOS and the SRM console. + ROM space to carry both the AlphaBIOS and the SRM console. To switch to SRM from AlphaBIOS, do the following: - enter the AlphaBIOS setup upon startup (F2 key, or ^B from serial console) @@ -21,7 +21,7 @@ Switching your MACHINE to SRM console: flash, and you will have to upgrade your firmware. You can get replacement firmware either from a firmware update CD-ROM - or via ftp from + or via FTP from ftp://ftp.digital.com/pub/DEC/Alpha/firmware/ Please refer to http://ftp.digital.com/pub/DEC/Alpha/firmware/readme.html @@ -42,13 +42,13 @@ Using the SRM console: information to boot OpenBSD/MACHINE. To see a list of devices connected to your alpha, you can - use the "show device" command. For booting the devices you + use the "show device" command. For booting, the devices you are interested in are "dva0" (the floppy drive) and "dka*" (the disk drives). You can set ROM variables by saying "set VARIABLE VALUE". Some variables you will want to set: - auto_action Determines what happens when you turn power on, + auto_action Determines what happens when you turn the power on, halt, or crash your machine. Valid values {:-include-:} "halt", "boot", and "restart". Most users will want to set this to "boot". @@ -61,7 +61,7 @@ Using the SRM console: boot_osflags Flags to pass to the kernel. IMPORTANT! For multiuser boot, this needs to be set to "a". - To see a list of all variables on your machine use the "show" + To see a list of all variables on your machine, use the "show" command with no arguments. You can bypass the boot_file and boot_osflags values from the command @@ -79,7 +79,7 @@ SRM console boot device restrictions: The built-in disk controllers on your MACHINE will always be supported, however on IDE-based machines, such as the EB164, 164SX and 164LX, as well as the low-end Personal Workstation (non-u models), you can plug - an SCSI controller, and boot from it if it is recognized. + in a SCSI controller, and boot from it if it is recognized. Recent SRM releases for these machines will be able to boot from the following controllers: @@ -128,4 +128,4 @@ OpenBSD/MACHINE console device restrictions: use display && keyboard console'', then you need to use a serial console. If your machine was not listed in the list above, please report this - on <alpha@OpenBSD.org>. + to <alpha@OpenBSD.org>. diff --git a/distrib/notes/alpha/xfer b/distrib/notes/alpha/xfer index 54e087a3eeb..92f1b8726f5 100644 --- a/distrib/notes/alpha/xfer +++ b/distrib/notes/alpha/xfer @@ -1,4 +1,4 @@ -dnl $OpenBSD: xfer,v 1.25 2003/03/24 11:33:56 miod Exp $ +dnl $OpenBSD: xfer,v 1.26 2004/03/17 09:25:09 jmc Exp $ Installation is supported from several media types, including: CD-ROM (NOT supported if booting from floppy) @@ -35,7 +35,7 @@ If you neither have a floppy drive nor a CD-ROM drive on your alpha: disk which will confuse the install script. To fix this you need to ask for a shell (answer "s" to the first question) when booting your disk and do "dd if=/dev/zero of=/dev/rsd0c - count=20" assuming your booted from sd0. After doing this you will + count=20", assuming you booted from sd0. After doing this you will not be able to boot that disk again unless you complete the install. You can now enter "install" and start the actual install process. diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents index 2e09b0344ec..4f5dad36f65 100644 --- a/distrib/notes/amd64/contents +++ b/distrib/notes/amd64/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.5 2004/03/08 22:31:28 miod Exp $ +dnl $OpenBSD: contents,v 1.6 2004/03/17 09:25:09 jmc Exp $ TopPart dnl uncomment as stuff becomes available dnl @@ -6,12 +6,12 @@ OpenBSDfloppy dnl dnl floppyB{:--:}OSrev.fs Another MACHINE boot and installation floppy; dnl this one features all the drivers not available -dnl in floppy{:--:}OSrev.fs, such as SCSI, RAID, gigabit -dnl ethernet, and such; see below. +dnl in floppy{:--:}OSrev.fs, such as SCSI, RAID, Gigabit +dnl Ethernet, and such; see below. dnl dnl floppyC{:--:}OSrev.fs Another MACHINE boot and installation floppy; dnl this one features most of the cardbus and -dnl pcmcia drivers; see below. +dnl PCMCIA drivers; see below. cdrom{:--:}OSrev.fs The MACHINE boot and installation 2.88MB floppy image that contains almost all @@ -27,7 +27,7 @@ OpenBSDcd dnl Uncomment if this really is worth providing... dnl -dnl As well you may be interested in +dnl Additionally, you may be interested in dnl dnl .../OSREV/tools/ dnl miscellaneous MACHINE installation utilities like diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware index f20e1435117..46744847c00 100644 --- a/distrib/notes/amd64/hardware +++ b/distrib/notes/amd64/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.7 2004/03/16 23:21:33 grange Exp $ +dnl $OpenBSD: hardware,v 1.8 2004/03/17 09:25:09 jmc Exp $ OpenBSD/MACHINE OSREV should work on all Athlon 64-based designs. OpenBSD does not currently support multiple processors (SMP), but will @@ -52,13 +52,13 @@ Supported hardware {:-include-:}: have a boot ROM; only the AHA-152x and motherboards using this chip are likely to be bootable, consequently.) Adaptec AIC-7770-based boards, including the Adaptec - AHA-274x and AHA-284x families) + AHA-274x and AHA-284x families Adaptec AHA-[23]94x[W] cards and some on-board PCI designs - using the AIC7870 and AIC7880 chips. + using the AIC7870 and AIC7880 chips Adaptec AHA-[23]94xU[2W] cards and some on-board PCI designs using the AIC789[01], AIC7895, AIC789[67] chips Adaptec AIC-789[29] chips and products like the - AHA-29160 based upon it which do 160MB/sec SCSI. + AHA-29160 based upon it which do 160MB/sec SCSI (However, the 7899G card is currently not supported with more than one device attached) AdvanSys 'U', 'UW', 'U2W' and 'U160' PCI SCSI diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install index 0836d6bb1f4..6ecd40f88fb 100644 --- a/distrib/notes/amd64/install +++ b/distrib/notes/amd64/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.3 2004/03/08 22:31:28 miod Exp $ +dnl $OpenBSD: install,v 1.4 2004/03/17 09:25:09 jmc Exp $ OpenBSDInstallPrelude If OpenBSD will be sharing the disk with another operating system, @@ -45,7 +45,7 @@ dnl Replace the following paragraph... wish to do an "(I)nstall". Enter 'I' for a fresh install. You will be presented with a welcome message and asked if - you really wish to install. Assuming you answered yes, the + you really wish to install. 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 or @@ -63,7 +63,7 @@ dnl once upgrades are available If fdisk is being invoked on your behalf, it will start by displaying the current partitions defined and then allow you - to modify this information, add new partitions and change + to modify this information, add new partitions, and change which partition to boot from by default. If you make a mistake, you will be allowed to repeat this procedure as necessary to correct this. Note that you should make OpenBSD be the active diff --git a/distrib/notes/cats/hardware b/distrib/notes/cats/hardware index 08d8e772bc8..9df1af49a39 100644 --- a/distrib/notes/cats/hardware +++ b/distrib/notes/cats/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.4 2004/03/08 22:29:42 miod Exp $ +dnl $OpenBSD: hardware,v 1.5 2004/03/17 09:25:09 jmc Exp $ OpenBSD/MACHINE runs on the Chalice/Simtec StrongARM 110 Evaluation Board. Supported devices {:-include-:}: @@ -34,7 +34,7 @@ Supported devices {:-include-:}: more than one device attached) AdvanSys 'U', 'UW', 'U2W' and 'U160' PCI SCSI controllers including the ABP940U[AW], - ASB3940U[AW]-00, ASB3940U2W-00 and ASB3950U160 + ASB3940U[AW]-00, ASB3940U2W-00, and ASB3950U160 AMD Am53c974 PCscsi-PCI SCSI controllers, including: Tekram DC-390 Initio INIC-940 and INIC-950 based PCI SCSI host diff --git a/distrib/notes/cats/prep b/distrib/notes/cats/prep index 29112c6bb55..a5fef683c88 100644 --- a/distrib/notes/cats/prep +++ b/distrib/notes/cats/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.6 2004/03/09 11:53:28 miod Exp $ +dnl $OpenBSD: prep,v 1.7 2004/03/17 09:25:09 jmc Exp $ To be able to boot the OpenBSD/MACHINE installation program, you will need to acquire some limited knowledge of ABLE Firmware, the low-level process that controls the microprocessor after hardware initialization @@ -9,7 +9,7 @@ A complete documentation on the ABLE firmware is available from Simtec at the following URL: http://www.simtec.co.uk/products/SWABLE/files/able-doc-allset/ -The board should be configured with jumpers LK12, LK13 and LK14 jumpers +The board should be configured with jumpers LK12, LK13, and LK14 set to the 1-2 position. However, most boards have been factory shipped with those jumpers incorrectly set to the 2-3 position. These jumpers are located as a block of three jumpers, near the processor and the serial @@ -37,7 +37,7 @@ For convenience, a few ABLE commands are described below: saves all variable changes to non-volatile memory. nvclear - restores environment variables defaults. + restores environment variables' defaults. The following environment variables control the system startup: diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install index 2bc5049d39a..9fcf2befeb7 100644 --- a/distrib/notes/hp300/install +++ b/distrib/notes/hp300/install @@ -1,10 +1,10 @@ -dnl $OpenBSD: install,v 1.26 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: install,v 1.27 2004/03/17 09:25:09 jmc 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 disks, but may be incomplete. Geometry may be calculated from an HP-UX `/etc/disktab' entry, but note that HP-UX geometry is based on -1024 byte sectors, while OpenBSD's is based on 512 byte sectors. +1024-byte sectors, while OpenBSD's is based on 512-byte sectors. The ramdisk kernel may be loaded from the network, from CD-ROM, or other SCSI devices (such as Zip(tm) disk). Note that loading from HP-IB or SCSI @@ -23,7 +23,7 @@ configuration, you may or may not see any messages on the console while this happens. Please note that booting from CD-ROM may not be supported by all models of -MACHINE. You will also need a CD-ROM drive which uses 512 byte blocks; +MACHINE. You will also need a CD-ROM drive which uses 512-byte blocks; anything which shipped with an MACHINE or is known to boot a SPARC or black NeXTStation should work. Modern CD-ROM drives jumpered to use 512-byte blocks should work as well. @@ -39,7 +39,7 @@ either have another OpenBSD system on the network, or something else capable of running the rbootd(8) program. Source code may be found under usr.sbin/rbootd in the OpenBSD source tree, but requires the Berkeley Packet Filter (bpf) in order to function. It may be possible to -use HP-UX, but is not recommended (or documented here). For more +use HP-UX, but it is not recommended (or documented here). For more information on diskless booting under OpenBSD, see the diskless(8) manual page. @@ -50,7 +50,7 @@ and place in it an entry like the following: 08:00:09:04:AA:33 SYS_UBOOT # thunder-egg -The first column is the ethernet address of the client's network interface. +The first column is the Ethernet address of the client's network interface. The second column is the program to send to the client, and anything after the `#' is a comment. Once you have rbootd running, copy the SYS_UBOOT program to the /usr/mdec/rbootd directory on your server. If this @@ -78,7 +78,7 @@ You are now ready to load SYS_UBOOT. During the client's self-test cycle, press the space bar. Shortly after, you should see a menu of possible boot options appear. Select the option corresponding to SYS_UBOOT. SYS_UBOOT will then load and prompt you for a kernel name. NFS file -names should not have a leading '/' prepended to them, simply use `bsd.rd'. +names should not have a leading '/' prepended to them; simply use `bsd.rd'. Installing using the CD-ROM or netboot procedure: @@ -108,7 +108,7 @@ OpenBSDBootMsgs graphics display, just hit return to select the default (hp300h). If you are using an ASCII terminal, it should either be an HP or vt100 compatible terminal; nothing else is supported. (If - your terminal type is xterm, just use vt100). + your terminal type is xterm, just use vt100.) OpenBSDInstallPart3({:- or "hd0" for HPIB/CS80 drives-:}) diff --git a/distrib/notes/hp300/prep b/distrib/notes/hp300/prep index aa85056de16..87988598480 100644 --- a/distrib/notes/hp300/prep +++ b/distrib/notes/hp300/prep @@ -1,8 +1,8 @@ -dnl $OpenBSD: prep,v 1.17 2003/09/06 22:22:43 miod Exp $ +dnl $OpenBSD: prep,v 1.18 2004/03/17 09:25:09 jmc Exp $ Most MACHINE machines don't generally need any specific preparation. -On series 400, you will wish to configure the prom as ``HP-UX compatible'' -before installing OpenBSD. To do so, at the prom prompt, enter ``CF'', +On series 400, you will wish to configure the PROM as ``HP-UX compatible'' +before installing OpenBSD. To do so, at the PROM prompt, enter ``CF'', then ``2'' (Boot Mode Selection), then ``2'' (HP-UX Compatible). Choose to make this setting Permanent with ``P'', then validate your changes with ``E''. Your machine will restart in HP-UX mode. diff --git a/distrib/notes/hppa/install b/distrib/notes/hppa/install index 6110186cec4..5e0cb8f665f 100644 --- a/distrib/notes/hppa/install +++ b/distrib/notes/hppa/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.7 2004/03/17 06:37:25 mickey Exp $ +dnl $OpenBSD: install,v 1.8 2004/03/17 09:25:09 jmc Exp $ dnl lots of texts coming from {mac68k,mvme68k,vax}/install initially OpenBSDInstallPrelude @@ -33,9 +33,9 @@ The first level is a short menu: Select from menu: -In this case, you will need to setup rbootd on the server. Start by creating +In this case, you will need to set up rbootd on the server. Start by creating an /etc/rbootd.conf file on the bootserver. The format of this file is the -ethernet address followed by the LIF filename. Here is an example: +Ethernet address followed by the LIF filename. Here is an example: 08:00:09:70:c4:11 lif{:--:}OSrev.fs @@ -98,7 +98,7 @@ OpenBSDBootMsgs installing from a non-serial console, the default of "vt100" is correct. If you are installing from a serial console you should choose the terminal type from amongst those listed. - (If your terminal type is xterm, just use vt100). + (If your terminal type is xterm, just use vt100.) OpenBSDInstallPart3 diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents index 2fce8d66ee4..f0678a1b137 100644 --- a/distrib/notes/i386/contents +++ b/distrib/notes/i386/contents @@ -1,16 +1,16 @@ -dnl $OpenBSD: contents,v 1.45 2003/09/09 22:29:04 miod Exp $ +dnl $OpenBSD: contents,v 1.46 2004/03/17 09:25:09 jmc Exp $ TopPart OpenBSDfloppy floppyB{:--:}OSrev.fs Another MACHINE boot and installation floppy; this one features all the drivers not available - in floppy{:--:}OSrev.fs, such as SCSI, RAID, gigabit - ethernet, and such; see below. + in floppy{:--:}OSrev.fs, such as SCSI, RAID, Gigabit + Ethernet, and such; see below. floppyC{:--:}OSrev.fs Another MACHINE boot and installation floppy; this one features most of the cardbus and - pcmcia drivers; see below. + PCMCIA drivers; see below. cdrom{:--:}OSrev.fs The MACHINE boot and installation 2.88MB floppy image that contains almost all @@ -24,7 +24,7 @@ OpenBSDrd OpenBSDcd -As well you may be interested in +Additionally, you may be interested in .../OSREV/tools/ miscellaneous MACHINE installation utilities like diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware index 8caa82c2726..ed61f7111c4 100644 --- a/distrib/notes/i386/hardware +++ b/distrib/notes/i386/hardware @@ -1,9 +1,9 @@ -dnl $OpenBSD: hardware,v 1.145 2004/03/16 08:25:00 jmc Exp $ -OpenBSD/MACHINE OSREV works across a broad range of standard PC's and +dnl $OpenBSD: hardware,v 1.146 2004/03/17 09:25:09 jmc Exp $ +OpenBSD/MACHINE OSREV works across a broad range of standard PCs and clones, with a wide variety of processors and I/O bus architectures. It can be expected to install and run with minimal difficulties on most current products. The cases where problems may be encountered are -typically older proprietary PC's, laptops or specialized server boxes +typically older proprietary PCs, laptops, or specialized server boxes that rely on a custom BIOS to paper over implementation differences. OpenBSD does not currently support multiple processors (SMP), but will @@ -58,7 +58,7 @@ Supported hardware {:-include-:}: Entropy Sources Interrupt latency collection from many devices Intel 82802 random number generator found on i810, i815, - i820, i840, i850 and i860 based systems. + i820, i840, i850, and i860 based systems. Disk Controllers Floppy controllers. ISA MFM, ESDI, IDE, and RLL hard disk controllers. @@ -100,11 +100,11 @@ Supported hardware {:-include-:}: Adaptec AIC-7770-based boards, including the Adaptec AHA-274x and AHA-284x families) [C] Adaptec AHA-[23]94x[W] cards and some on-board PCI designs - using the AIC7870 and AIC7880 chips. [C] + using the AIC7870 and AIC7880 chips [C] Adaptec AHA-[23]94xU[2W] cards and some on-board PCI designs using the AIC789[01], AIC7895, AIC789[67] chips [C] Adaptec AIC-789[29] chips and products like the - AHA-29160 based upon it which do 160MB/sec SCSI. [C] + AHA-29160 based upon it which do 160MB/sec SCSI [C] (However, the 7899G card is currently not supported with more than one device attached) AdvanSys 'U', 'UW', 'U2W' and 'U160' PCI SCSI @@ -882,7 +882,7 @@ IsoLan, NE2100, and DEPCA Intel EtherExpress PRO/10 ex0 0x320 5 -PCI ethernet boards need to have an interrupt, either assigned in your +PCI Ethernet boards need to have an interrupt, either assigned in your PCI BIOS, or autoconfigured. Hardware not listed in the above table doesn't need any specific @@ -947,8 +947,8 @@ Special care for PCI BIOS: Sometimes specifications are unclear about interfaces and/or data validation. These all cause our driver for PCI BIOS to misbehave in more or - less fatal ways, such as panics on pcibios0 configuration or pci - device attachments, or unconfigured pci devices due to irq and/or + less fatal ways, such as panics on pcibios0 configuration or PCI + device attachments, or unconfigured PCI devices due to IRQ and/or I/O address misconfiguration. Fast workaround @@ -970,12 +970,12 @@ Special care for PCI BIOS: UKC> quit This will disable the pcibios0 attachment. - Sometimes, especially when hangs occur on particular pci device - attachments, moving pci cards into a different slot helps. + Sometimes, especially when hangs occur on particular PCI device + attachments, moving PCI cards into a different slot helps. Fixing for good Try to gather dmesg output from the failing configuration, for - example by using a serial console (see boot(8)) and send it to + example by using a serial console (see boot(8)), and send it to <mickey@OpenBSD.org> along with descriptions of your hardware setup. Alternatively, dig in the code and fix problems. diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install index 64859e17d49..c7b2d80f711 100644 --- a/distrib/notes/i386/install +++ b/distrib/notes/i386/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.35 2003/03/24 11:33:56 miod Exp $ +dnl $OpenBSD: install,v 1.36 2004/03/17 09:25:09 jmc Exp $ OpenBSDInstallPrelude If OpenBSD will be sharing the disk with DOS or another operating @@ -51,7 +51,7 @@ OpenBSDInstallPart3({:- or "wd0" for IDE/RLL/ESDI/ST506 drives-:}) If fdisk is being invoked on your behalf, it will start by displaying the current partitions defined and then allow you - to modify this information, add new partitions and change + to modify this information, add new partitions, and change which partition to boot from by default. If you make a mistake, you will be allowed to repeat this procedure as necessary to correct this. Note that you should make OpenBSD be the active diff --git a/distrib/notes/i386/prep b/distrib/notes/i386/prep index db0c9f1ed9e..35113c766d5 100644 --- a/distrib/notes/i386/prep +++ b/distrib/notes/i386/prep @@ -41,7 +41,7 @@ editor to create at least one of the partitions to be used for that operating system. If that operating system is already set up to use the entire disk, you will have to back it up, remove and recreate a smaller partition for it, and then restore the data from that partition. You do -not have to create an OpenBSD partition at this time, the OpenBSD install- +not have to create an OpenBSD partition at this time; the OpenBSD install- ation will give you an opportunity to create the partition needed for OpenBSD. diff --git a/distrib/notes/i386/upgrade b/distrib/notes/i386/upgrade index 89c6e0b6ecd..9dcedb3da5b 100644 --- a/distrib/notes/i386/upgrade +++ b/distrib/notes/i386/upgrade @@ -1,16 +1,16 @@ -dnl $OpenBSD: upgrade,v 1.22 2003/11/10 22:11:35 espie Exp $ +dnl $OpenBSD: upgrade,v 1.23 2004/03/17 09:25:09 jmc Exp $ dnl OpenBSDUpgrade({:-the CD-ROM or an installation floppy as you would do for dnl a new installation-:}) Due to the change from a.out to ELF binary format in OpenBSD OSREV, upgrades can be a complex, delicate process. The best solution, whenever -possible, is to backup your data and reinstall from scratch. +possible, is to back up your data and reinstall from scratch. The second best solution is to remove all ports, third party programs and libraries installed on your system; upgrade; and then add ELF versions of the removed files. In all cases, once you start the upgrade you MUST complete it. If the -upgrade process fails or is abandoned before it completes you will almost +upgrade process fails, or is abandoned before it completes, you will almost certainly be left with a non-functional system. Finally, you cannot use the bsd.rd kernel to upgrade the system. The @@ -29,7 +29,7 @@ OSREV system while preserving the functioning of a.out binaries are: for proper operation of older binaries. Before you start the upgrade process, the a.out emulation area needs to be -set up. It needs to be put inside a /emul/a.out hierarchy. This directory can, +set up. It needs to be put inside an /emul/a.out hierarchy. This directory can, however, be a symbolic link, should the available space in the root partition not be enough. diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common index 42da4205164..5c747284ac9 100644 --- a/distrib/notes/m4.common +++ b/distrib/notes/m4.common @@ -1,5 +1,5 @@ dnl -dnl $OpenBSD: m4.common,v 1.53 2004/03/16 08:24:59 jmc Exp $ +dnl $OpenBSD: m4.common,v 1.54 2004/03/17 09:25:09 jmc Exp $ dnl dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org> dnl @@ -133,7 +133,7 @@ define({:-OpenBSDetc-:}, system from scratch, but should NOT be used if you are upgrading. (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 + configuration files by hand; see the section named "Upgrading a previously-installed OpenBSD System" below.)-:},.)showsize($1,$2)-:})dnl dnl dnl @@ -211,7 +211,7 @@ define({:-OpenBSDfloppydesc-:}, {:-Bootable installation/upgrade floppy image$3: The $1 floppy image$3 can be copied to a floppy using rawrite.exe, - ntrw.exe or `dd', as described later in this document. + ntrw.exe, or `dd', as described later in this document. $2 floppy image is a bootable install floppy which can be used both to install and to upgrade OpenBSD to the current version. It is also useful for maintenance and disaster recovery.-:})dnl @@ -329,7 +329,7 @@ define({:-OpenBSDInstallPart4-:}, is usually in partition 'b'.$1 It is recommended that you create separate partitions for /usr, - /tmp and /var, and if you have room for it, one for /home. In + /tmp, and /var, and if you have room for it, one for /home. In doing this, remember to skip 'c', leaving it as type "unused". For help in the disk label editor, enter '?' or 'M' to view the manual page (see the info on the ``-E'' flag).-:})dnl @@ -375,7 +375,7 @@ define({:-OpenBSDInstallNet-:}, Next the system will give you a list of network interfaces you can configure. For each network interface you select to configure, it will ask for the IP address to use, the symbolic host name to use, - the netmask to use and any interface-specific flags to set. The + the netmask to use, and any interface-specific flags to set. The interface-specific flags are usually used to determine which media the network card is to use. Typically no media flags are required as autodetection normally works, but you will be prompted with a @@ -383,7 +383,7 @@ define({:-OpenBSDInstallNet-:}, any. In doubt, do not enter any media flags; or you can refer to the manual page for your interface for the appropriate flags. - After all network interfaces have been configured the install pro- + After all network interfaces have been configured, the install pro- gram will ask for a default route and IP address of the primary name server to use. You will also be presented with an opportunity to edit the host table. @@ -407,44 +407,44 @@ define({:-OpenBSDFTPInstall-:}, pieces of information. Don't be daunted by this list; the defaults are sufficient for most people. 1) Proxy server URL if you are using a URL-based - ftp proxy (squid, CERN ftp, Apache 1.2 or higher). + FTP proxy (squid, CERN FTP, Apache 1.2 or higher). You need to {:-define-:} a proxy if you are behind a - firewall that blocks outgoing ftp (assuming you + firewall that blocks outgoing FTP (assuming you have a proxy available to use). - 2) Do you need to use active mode ftp? By default, + 2) Do you need to use active mode FTP? By default, ftp will attempt to use passive mode and fall back to an active connection if the server does not support passive mode. You only need to enable - this option if you are connecting to a buggy ftp - daemon that implements passive ftp incorrectly. + this option if you are connecting to a buggy FTP + daemon that implements passive FTP incorrectly. Note that you will not be asked about active - ftp if you are using a proxy. + 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 + DNS earlier in the install) of an FTP server carrying the OpenBSD OSREV 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. + 4) The FTP directory holding the distribution sets. The default value of pub/OpenBSD/OSREV/MACHINE is almost always correct. - 5) The login and password for the ftp account. + 5) The login and password for the FTP account. You will only be asked for a password for - non-anonymous ftp. + non-anonymous FTP. For instructions on how to complete the installation via - ftp, see the section named "Common URL installations" below.-:})dnl + FTP, see the section named "Common URL installations" below.-:})dnl dnl define({:-OpenBSDHTTPInstall-:}, {:- To install via HTTP: To begin an HTTP install you will need the following pieces of information: 1) Proxy server URL if you are using a URL-based - http proxy (squid, CERN ftp, Apache 1.2 or higher). + HTTP proxy (squid, CERN FTP, Apache 1.2 or higher). You need to {:-define-:} a proxy if you are behind a - firewall that blocks outgoing http connections + firewall that blocks outgoing HTTP connections (assuming you have a proxy available to use). 2) The IP address (or hostname if you enabled - DNS earlier in the install) of an http server + DNS earlier in the install) of an HTTP server carrying the OpenBSD OSREV distribution. If you don't know, just hit return when asked if you want to see a list of such hosts. @@ -452,10 +452,10 @@ define({:-OpenBSDHTTPInstall-:}, There is no standard location for this; You should use the directory specified along with the server in the list of official - http mirror sites that you received in step 3. + HTTP mirror sites that you received in step 3. For instructions on how to complete the installation via - http, see the section named "Common URL installations" below.-:})dnl + HTTP, see the section named "Common URL installations" below.-:})dnl dnl dnl For arches where you can create a boot tape, $1 can be set as the dnl file index of the first set, after the boot files. @@ -501,8 +501,8 @@ define({:-OpenBSDCDROMInstall-:}, file system installations" below.-:})dnl dnl define({:-OpenBSDNFSInstall-:}, -{:- To install from a NFS mounted directory: - When installing from a NFS-mounted directory, you must +{:- To install from an NFS mounted directory: + When installing from an NFS-mounted directory, you must have completed network configuration above, and also set up the exported file system on the NFS server in advance. @@ -544,9 +544,9 @@ define({:-OpenBSDDISKInstall-:}, {:- To install from a local disk partition: When installing from a local disk partition, you will first have to identify which disk holds the distribution - sets. This is normally $1"sdN" where N is a number + sets. This is normally $1"sdN", where N is a number 0 through 9. Next you will have to identify the partition - within that disk that holds the distribution, this is a + within that disk that holds the distribution; this is a single letter between 'a' and 'p'. You will also have to identify the type of file system @@ -560,7 +560,7 @@ define({:-OpenBSDDISKInstall-:}, with a '/'. For instructions on how to complete the installation from - the a local disk partition, see the next section.-:})dnl + 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. @@ -617,7 +617,7 @@ define({:-OpenBSDCommonURL-:}, When all the selected distribution sets has been extracted, you will be allowed to select which time zone your system will be using, all the device nodes needed by the installed system will - be created for you and the file systems will be unmounted. For + 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 "base{:--:}OSrev", "etc{:--:}OSrev", and "bsd" distribution sets.-:})dnl dnl @@ -714,7 +714,7 @@ define({:-OpenBSDXferFloppyFromDOS-:}, images. If you can access the distribution from the CD-ROM under DOS, you will find the bootable disks in the OSREV/MACHINE directory. Otherwise, you will have to download them from one of - the OpenBSD ftp or http mirror sites, using an ftp client or a web + the OpenBSD FTP or HTTP mirror sites, using an FTP client or a web browser. In either case, take care to do "binary" transfers, since these are images files and any DOS cr/lf translations or control/z EOF interpretations will result in corrupted transfers. @@ -723,7 +723,7 @@ define({:-OpenBSDXferFloppyFromDOS-:}, copy of the rawrite.exe utility and its documentation. This program is needed to correctly copy the bootable filesystem image to the floppy, since it's an image of a unix partition - containing a ffs filesystem, not a MSDOS format diskette. + containing an ffs filesystem, not an MSDOS format diskette. Once you have installed rawrite.exe, just run it and specify the name of the bootable image, such as "floppy{:--:}OSrev.fs" and the name of @@ -938,7 +938,7 @@ and then tailor it for your server operating system before running it. Note that MAKEDEV is written specifically for ksh, and may not work on any other bourne shell. -There will be error messages about unknown user and groups. These errors are +There will be error messages about unknown users and groups. These errors are inconsequential for the purpose of installing OpenBSD. However, you may -want to correct them if you plan to the diskless setup regularly. In that +want to correct them if you plan to use the diskless setup regularly. In that case, you may re-run MAKEDEV on your OpenBSD machine once it has booted.-:})dnl diff --git a/distrib/notes/mac68k/hardware b/distrib/notes/mac68k/hardware index 70b0bad9e73..d4a2e6cd78f 100644 --- a/distrib/notes/mac68k/hardware +++ b/distrib/notes/mac68k/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.18 2004/03/15 08:37:25 xsa Exp $ +dnl $OpenBSD: hardware,v 1.19 2004/03/17 09:25:09 jmc Exp $ OpenBSD/MACHINE OSREV runs on several of the older Macintosh computers. 6MB of RAM should be sufficient to boot and a minimal system can probably be squeezed onto a 100MB partition by installing just the minimum sets. @@ -40,7 +40,7 @@ Supported devices on all of the above systems {:-include-:}: ADB keyboards and mice Ethernet cards based on the Natl. Semiconductor 8390 (Asante, Apple, and a few others) - Some ethernet cards based on the SONIC chip including internal + Some Ethernet cards based on the SONIC chip including internal Ethernet on many of Apple's non-AV Quadras/Centrises and PowerBook 500 series. @@ -63,7 +63,7 @@ What isn't supported, but often asked about: itself contains a major bug which is presently being worked on. However, machines such as the Centris 605 don't work right now. - LCPDS ethernet cards. - Apple Communication Slot (CS) ethernet cards. - Quadra/Centris AV series' onboard MACE ethernet. + LCPDS Ethernet cards. + Apple Communication Slot (CS) Ethernet cards. + Quadra/Centris AV series' onboard MACE Ethernet. Floppy drive. diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install index fcff38ff09f..5a597f42095 100644 --- a/distrib/notes/mac68k/install +++ b/distrib/notes/mac68k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.25 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: install,v 1.26 2004/03/17 09:25:09 jmc Exp $ OpenBSDInstallPrelude The installation can be broken down into four basic steps: @@ -15,7 +15,7 @@ you for the SCSI ID of the drive that you are installing upon. Once this is selected, it will present a list of the partitions on that disk. Select the partition on which you wish to build a filesystem and click on the "Format" button. You will now be asked for a bunch of parameters -for the hard drive and the filesystem. Usually, you can just take the +for the hard drive and the filesystem. Usually, you can just accept the defaults. Note that although this dialog only has the "OK" button, you are not committed, yet. Once you get the values you want, press the "OK" button. A dialog will be presented at this point with two options: "Format" @@ -51,10 +51,10 @@ If you are installing onto a single root partition, proceed to the Just before it printed, "Mounting partition 'A' as /," it printed lines like: sd1 at scsi ID 5. - This means that the device for scsi ID 5 is sd1. The partitions + This means that the device for SCSI ID 5 is sd1. The partitions are signified by a trailing letter. For instance, sd1a would be - the root partition of the second scsi disk in the chain, and sd0g - would be the first usr partition on the first scsi disk. It is + the root partition of the second SCSI disk in the chain, and sd0g + would be the first usr partition on the first SCSI disk. It is important to emphasize that device numbers after the 'sd' do not correspond to SCSI IDs of disks but rather to logical disks. The lowest SCSI ID will always be sd0 proceeded by increasing ID @@ -72,7 +72,7 @@ If you are installing onto a single root partition, proceed to the * Mount the filesystems you wish with the command: mount device path For example, if you wish to mount the second partition from - the first scsi disk, sd0, on /usr, you would type: + the first SCSI disk, sd0, on /usr, you would type: mount /dev/sd0b /usr * Type "quit" to exit the minishell after you have mounted @@ -128,19 +128,20 @@ the root password using the passwd(1) command. To set up basic networking, you will need to create or edit the following files, all of which are in the /etc directory: - myname the computers name (with a fully-qualified domain name). + myname the computer's name (with a fully-qualified + domain name). mygate the IP address of the default gateway. - hostname.if Configuration of the host adapter (actual name will - be something like hostname.sn0 or hostname.ae0, see - your dmesg for your adapter name). - resolv.conf Name server configuration. + hostname.if configuration of the host adapter (the actual name + will be something like hostname.sn0 or hostname.ae0; + see your dmesg for your adapter name). + resolv.conf name server configuration. hosts names and IP addresses of this machine and others on the network. dhclient.conf dhcp client information. Once these files are configured, your system will be very much like any other OpenBSD system. 'mygate' and 'myname' are just single-line text -files, for info on the others, see hostname.if(5), resolv.conf(5), hosts(5) +files; for info on the others, see hostname.if(5), resolv.conf(5), hosts(5), and dhclient.conf(5) in the OpenBSD man pages. diff --git a/distrib/notes/mac68k/prep b/distrib/notes/mac68k/prep index a66298ab69f..c907556f390 100644 --- a/distrib/notes/mac68k/prep +++ b/distrib/notes/mac68k/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.12 2004/03/15 08:37:25 xsa Exp $ +dnl $OpenBSD: prep,v 1.13 2004/03/17 09:25:09 jmc Exp $ Find your favorite disk partitioning utility. Some of the ones that have been tried and seem to work are: APS Powertools 2.7.3 @@ -44,13 +44,13 @@ partitioning it with Mac OS partitions of the correct size. If you do this, simply select the "Convert" button when choosing partitions to build a filesystem on in Mkfs (see below). -Before moving on, you should assure that your machine is running the correct +Before moving on, you should make sure that your machine is running the correct software on the Mac OS side. In the Memory control panel, you should turn Virtual Memory off whenever you are planning to use the BSD/Mac68k Booter. -You should also assure that your machine is using 32-bit addressing. If +You should also make sure that your machine is using 32-bit addressing. If there is no "Addressing:" option in your Memory control panel and your -machine is supported, your probably will need Mode32. Mode32 is a control -panel and extension combination which enable 32-bit addressing on older Macs +machine is supported, you will probably need Mode32. Mode32 is a control +panel and extension combination which enables 32-bit addressing on older Macs which do not use it by default. This program is available from any Info-Mac mirror. Finally, we recommend strongly that, at least for the purposes of setting the system up, you run with the machine's monitor in 1-bit ("Black diff --git a/distrib/notes/mac68k/upgrade b/distrib/notes/mac68k/upgrade index 3404b78302b..259637a65e4 100644 --- a/distrib/notes/mac68k/upgrade +++ b/distrib/notes/mac68k/upgrade @@ -1,5 +1,5 @@ To upgrade to OpenBSD OSREV from a previous version, you should follow the -instructions on installing the system beginning with using the MacBSD +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 Mac OS. @@ -9,5 +9,5 @@ harmless place and unpack it with a command like 'tar zxvf etc{:--:}OSrev.tgz'. 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 highly recommended that when upgrading your -kernel binary (/bsd) you backup the old, working kernel and extract +kernel binary (/bsd) you back up the old, working kernel and extract bsd.tgz into / only from OpenBSD. diff --git a/distrib/notes/mac68k/whatis b/distrib/notes/mac68k/whatis index 9343213dc22..9f4041f4382 100644 --- a/distrib/notes/mac68k/whatis +++ b/distrib/notes/mac68k/whatis @@ -2,6 +2,6 @@ OpenBSD/MACHINE OSREV is a port to the old Macintosh (680x0-based) 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 -functional making the system an excellent answer to the question +functional, making the system an excellent answer to the question of a UN*X-like operating system for the Mac 680x0 line of computers. diff --git a/distrib/notes/mac68k/xfer b/distrib/notes/mac68k/xfer index cf1efadcf52..0b85248d50c 100644 --- a/distrib/notes/mac68k/xfer +++ b/distrib/notes/mac68k/xfer @@ -1,10 +1,10 @@ -dnl $OpenBSD: xfer,v 1.15 2004/03/15 11:41:50 xsa Exp $ +dnl $OpenBSD: xfer,v 1.16 2004/03/17 09:25:09 jmc Exp $ 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 on the HFS partition or AppleShare volume for the largest file that you will have to install. -You will also need to collect the Mac OS tools: +You will also need to collect the following Mac OS tools: Mkfs, BSD Install Utility, and BSD/Mac68k Booter. diff --git a/distrib/notes/macppc/hardware b/distrib/notes/macppc/hardware index 1e7a340db0f..e61c0cb7dd1 100644 --- a/distrib/notes/macppc/hardware +++ b/distrib/notes/macppc/hardware @@ -1,5 +1,5 @@ -dnl $OpenBSD: hardware,v 1.28 2004/03/14 08:59:00 mickey Exp $ -OpenBSD/MACHINE OSREV runs on iMac, G4 Power Macintosh, G4 Cube as well +dnl $OpenBSD: hardware,v 1.29 2004/03/17 09:25:09 jmc Exp $ +OpenBSD/MACHINE OSREV runs on iMac, G4 Power Macintosh, and G4 Cube, as well as PowerBook and iBook machines. Machines with older firmware: 6xxx, 7xxx 8xxx, and 9xxx machines are @@ -9,7 +9,7 @@ OpenBSD/MACHINE has been tested on iMac Revs A-C as well as on iMac DV(+) machines, Power Macintosh G4 systems (single and dual processor), as well as the G4 Cube, B&W G3 and LCD iMac. -For portables, PowerBook G3, PowerBook G4 (12", 15", 17"), iBook and iBook2 +For portables, PowerBook G3, PowerBook G4 (12", 15", 17"), iBook, and iBook2 have been tested. Note that power saving features on portables are very limited, limited power management features are available, suspend/sleep is not supported. However battery level and status charging/AC @@ -64,7 +64,7 @@ Supported devices {:-include-:}: HME PCI Fast Ethernet (hme) HME PCI Quad Fast Ethernet (hme) Onboard Older iMac 10-100Mbs (bm) Ethernet - Onboard G4/PowerBook/Newer iMac (gem) ethernet + Onboard G4/PowerBook/Newer iMac (gem) Ethernet Intel i8255x-based (except the i82556) PCI adapters (fxp), including: Intel EtherExpress PRO/10+ diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install index 42686293043..1a2a7d761ae 100644 --- a/distrib/notes/macppc/install +++ b/distrib/notes/macppc/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.20 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: install,v 1.21 2004/03/17 09:25:09 jmc Exp $ OpenBSDInstallShortPrelude Before you begin, you should decide if OpenBSD is to be installed @@ -17,7 +17,7 @@ and reinstalled under Mac OS. OpenBSDInstallPart2 At this time, the system can be installed from the supplied - CD-ROM boot image, by network loading the bootloader or loading + CD-ROM boot image, by network loading the bootloader, or loading the bootloader and kernel from an HFS partition. Once the bootloader is installed on the local hard drive, the @@ -31,7 +31,7 @@ OpenBSDInstallPart2 during reboot and selecting the Mac OS Disk icon. (Refer to "Preparing your System for OpenBSD Installation" above - for information on how to access and boot from Open Firmware) + for information on how to access and boot from Open Firmware.) OpenBSDBootMsgs @@ -40,7 +40,7 @@ OpenBSDBootMsgs OpenBSDInstallPart3({:- or "wd0" for IDE/ATA drives-:}) - Next you will have to edit or create a disklabel for the disk + Next you will have to edit or create a disk label for the disk OpenBSD is being installed on. If there are any existing partitions defined (for any operating system), and a disk label is not found, you will first be given an opportunity to run @@ -100,7 +100,7 @@ OpenBSDInstallPart3({:- or "wd0" for IDE/ATA drives-:}) If fdisk is being invoked, it will start by displaying the current partitions defined and then allow you - to modify this information, add new partitions and change + to modify this information, add new partitions, and change which partition to boot from by default. If you make a mistake, you will be allowed to repeat this procedure as necessary to correct this. Note that you should make OpenBSD be the active @@ -116,7 +116,7 @@ OpenBSDInstallPart4({:-If you have DOS or Linux spare partition where OpenBSD can be installed. No low disk boundaries exist on MACHINE. MACHINE is unable to install the bootloader into the HFS(+) partition to boot OpenBSD so it is - necessary copy 'ofwboot' from the installation media into + necessary to copy 'ofwboot' from the installation media into the first HFS(+) partition using Mac OS or Mac OS X. If the disk is partitioned using MBR, the bootloader is diff --git a/distrib/notes/macppc/prep b/distrib/notes/macppc/prep index 82e3c107db0..da276a45107 100644 --- a/distrib/notes/macppc/prep +++ b/distrib/notes/macppc/prep @@ -1,12 +1,12 @@ -dnl $OpenBSD: prep,v 1.9 2004/03/15 08:37:25 xsa Exp $ +dnl $OpenBSD: prep,v 1.10 2004/03/17 09:25:09 jmc Exp $ To be able to boot the OpenBSD/MACHINE installation program, you will need to acquire some limited knowledge of OpenFirmware, the low-level process that controls the microprocessor after hardware initialization and diagnostics are performed but before control is handed to the operating system. -To access Open Firmware you should simultaneously hold down the -Command, Option, O and F keys immediately upon booting. You will +To access Open Firmware, you should simultaneously hold down the +Command, Option, O, and F keys immediately upon booting. You will be presented with information and a ">" prompt that will look something like this (example taken from a Power Macintosh G4): @@ -43,10 +43,10 @@ shut-down (halt the machine; shutdown) printenv (print current machine variables) setenv (set a machine variable) devalias (list device aliases; useful for locating other - devices in the machine such as hard drives etc) + devices in the machine such as hard drives, etc) -As seen above, device aliases typically take the form of "ide", "cd" -etc. To boot to an alternative device you may substitute them +As seen above, device aliases typically take the form of "ide", "cd", +etc. To boot to an alternative device, you may substitute them with entries from this list (example devices taken from a Power Macintosh G4): @@ -54,7 +54,7 @@ ultra0 = hd = master device, primary ATA bus (factory-installed drive) ultra1 = slave device, primary ATA bus ide0 = cd = master device, secondary ATA bus (CD/DVD drive) ide1 = slave device, secondary ATA bus (Zip drive, if installed) -enet = motherboard ethernet device +enet = motherboard Ethernet device Other Open Firmware command examples: @@ -76,8 +76,8 @@ words (show methods of items at current location in the device device tree) -To reset a Power Macintosh to the factory-configure Open Firmware settings, -simultaneously hold down the Command, Option, P, R keys immediately upon +To reset a Power Macintosh to the factory-configured Open Firmware settings, +simultaneously hold down the Command, Option, P, and R keys immediately upon booting. Typically the machine will then attempt to load Mac OS, if available. @@ -99,12 +99,12 @@ copied into the first HFS(+) partition. It is not necessary to specify '/bsd' on the boot line or in the boot-device variable, since it is the default. -To boot in Mac OS with this setup (works on most supported machines) +To boot in Mac OS with this setup (works on most supported machines), press and hold down the Alt/Option key during reboot, and select which (Mac OS/Mac OS X) partition to boot in the graphical boot selector presented. Note that OpenBSD does not currently show up in this boot selector except for the installation CD-ROM. This works on most machines -this has been tested with, but does not work on a Rev C (333MHz) iMac, +this has been tested with, but does not work on a Rev C (333MHz) iMac; perhaps this feature was added to the Openfirmware ROM after that machine. @@ -112,14 +112,14 @@ machine. Sharing a disk with Mac OS: OpenBSD/MACHINE is capable of booting either from a dedicated disk using -a MBR partitioned disk or sharing a disk with Mac OS. +an MBR partitioned disk or sharing a disk with Mac OS. If the disk is to be shared between Mac OS and OpenBSD, it is necessary to reformat and install the Mac OS partitions first, using "Drive Setup", leaving space on the disk as an "Unused" partition. -If the disk was previously partitioned, it is possible to reuse a Partition -for OpenBSD, as long as it is not the first Partition on the disk. -The bootloader is expected to be found in that first (HFS) Partition. +If the disk was previously partitioned, it is possible to reuse a partition +for OpenBSD, as long as it is not the first partition on the disk. +The bootloader is expected to be found in that first (HFS) partition. For dedicated disks, MACHINE port boots off a boot program in an MSDOS filesystem. This is set up by the install program diff --git a/distrib/notes/macppc/xfer b/distrib/notes/macppc/xfer index 8f4e2cef687..22e03479e87 100644 --- a/distrib/notes/macppc/xfer +++ b/distrib/notes/macppc/xfer @@ -1,4 +1,4 @@ -dnl $OpenBSD: xfer,v 1.9 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: xfer,v 1.10 2004/03/17 09:25:09 jmc Exp $ Installation is supported from several media types, including: CD-ROM @@ -10,12 +10,12 @@ Installation is supported from several media types, including: OpenBSDXferShortPrelude -OpenBSD now can be booted from a CD-ROM by holding down the 'c' key +OpenBSD can now be booted from a CD-ROM by holding down the 'c' key during reboot. If ofwboot and bsd.rd are copied to an HFS partition, it is possible to boot from those files. Then install the rest of the files from any of the above sources. -Note: Once a OpenBSD partition exists, it is not possible to load the +Note: Once an OpenBSD partition exists, it is not possible to load the kernel (bsd.rd) from an HFS partition on that disk. diff --git a/distrib/notes/mirrors b/distrib/notes/mirrors index 457ae4aa26f..1090910e83c 100644 --- a/distrib/notes/mirrors +++ b/distrib/notes/mirrors @@ -1,5 +1,5 @@ -dnl $OpenBSD: mirrors,v 1.50 2004/03/04 08:31:00 david Exp $ -This is a list of currently known ftp servers as the time of the OSREV release. +dnl $OpenBSD: mirrors,v 1.51 2004/03/17 09:25:09 jmc Exp $ +This is a list of currently known FTP servers at the time of the OSREV release. For a more recent list, please refer to http://www.OpenBSD.org/ftp.html Main server in Canada: @@ -145,7 +145,7 @@ USA: ftp://mirror.cs.wisc.edu/pub/mirrors/OpenBSD (Madison, WI) -As well, the file ftp://ftp.OpenBSD.org/pub/OpenBSD/OSREV/ftplist +Additionally, the file ftp://ftp.OpenBSD.org/pub/OpenBSD/OSREV/ftplist contains a list which is continually updated. If you wish to become a distribution site for OpenBSD, contact <www@OpenBSD.org>. diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware index e0e4e1f764a..ee6f4ef57a1 100644 --- a/distrib/notes/mvme68k/hardware +++ b/distrib/notes/mvme68k/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.12 2003/09/06 23:34:00 miod Exp $ +dnl $OpenBSD: hardware,v 1.13 2004/03/17 09:25:10 jmc Exp $ OpenBSD/MACHINE OSREV runs on the following classes of machines: - MVME147 - Motorola with 68030 and 68881 - MVME162 - Motorola with 68040 and IndustryPack slots @@ -18,8 +18,8 @@ Supported devices {:-include-:}: MVME147: serial ports: on-board ttya-ttyd - ethernet: - on-board AMD 7990 Lance ethernet (le) + Ethernet: + on-board AMD 7990 Lance Ethernet (le) SCSI: on-board WD33C93 controller VMEbus: @@ -28,8 +28,8 @@ MVME147: MVME162, MVME172: serial ports: on-board tty00-03 - Zilog Z85230 SCC - ethernet: - on-board Intel 82596CA ethernet (ie) + Ethernet: + on-board Intel 82596CA Ethernet (ie) SCSI: on-board NCR53c710 controller VMEbus: @@ -47,8 +47,8 @@ MVME162, MVME172: MVME167, MVME177: serial ports: on-board tty00 - tty03 - Cirrus Logic CD2401 - ethernet: - on-board Intel 82596CA ethernet (ie) + Ethernet: + on-board Intel 82596CA Ethernet (ie) SCSI: on-board NCR53c710 controller SRAM: @@ -63,4 +63,4 @@ Additional VMEbus devices supported by the OpenBSD/MACHINE port {:-include-:}: MVME328 SCSI controller (vs) - MVME376 VME bus ethernet (le) + MVME376 VME bus Ethernet (le) diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install index 4536d533667..007d5d82d44 100644 --- a/distrib/notes/mvme68k/install +++ b/distrib/notes/mvme68k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.25 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: install,v 1.26 2004/03/17 09:25:10 jmc Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -26,7 +26,7 @@ to "go back" for some reason. After taking care of all that, the system should be brought down gracefully using the shutdown(8) and/or halt(8) commands, which will eventually go -bakc to the ``BUG>'' prompt (it may be necessary to send a break if the +back to the ``BUG>'' prompt (it may be necessary to send a break if the system is completely halted). @@ -201,7 +201,7 @@ to the short description above for details. Second, using a terminal emulator able to read files from the local machine and send their contents over the serial link, such as cu(1) and tip(1) - both being available on OpenBSD - the MACHINE workstation should be put in -S-Records receive mode, with the LO command at the BUG prompr: +S-Records receive mode, with the LO command at the BUG prompt: 147-Bug> LO @@ -293,7 +293,7 @@ program via TFTP after having acquired its IP address through RevARP when instructed to boot "over the net". If you are booting from S-Records, it will look for a filename composed of the machine's IP address, followed by the machine's architecture, separated by a period (for example, a MACHINE -board which has been assigned IP address 130.115.144.11, will make an TFTP +board which has been assigned IP address 130.115.144.11 will make a TFTP request for `8273900B.MACHINE'); if you are booting from the NBO command, you can specify the filename which will be looked for. diff --git a/distrib/notes/mvme68k/prep b/distrib/notes/mvme68k/prep index 4623d3b4a66..c8da153f383 100644 --- a/distrib/notes/mvme68k/prep +++ b/distrib/notes/mvme68k/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.7 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: prep,v 1.8 2004/03/17 09:25:10 jmc Exp $ Before installing OpenBSD on your machine, you will want to check your machine's NVRAM settings, from the BUG. @@ -20,7 +20,7 @@ with the SD command: 167-Diag> SD 167-Bug> -The defaults settings are usually suitable for OpenBSD; make sure the +The default settings are usually suitable for OpenBSD; make sure the environment is configured in BUG mode. You can check and change this with the ENV command. Ideally, the first two items of the ENV data will be as follows: @@ -33,7 +33,7 @@ in order to boot directly into the BUG, without executing the complete selftest sequence. Do not forget, after changing the ENV parameters, to save the changes in NVRAM as suggested by the ENV command itself. -If the board has a built-in ethernet controller, its address must be correct; +If the board has a built-in Ethernet controller, its address must be correct; the LSAD command allows the address to be edited. OpenBSD/MACHINE will not run correctly if the clock is stopped (power-saving diff --git a/distrib/notes/mvme68k/whatis b/distrib/notes/mvme68k/whatis index 913b11f8fd3..53430e051b5 100644 --- a/distrib/notes/mvme68k/whatis +++ b/distrib/notes/mvme68k/whatis @@ -1,6 +1,6 @@ -dnl $OpenBSD: whatis,v 1.6 2003/06/21 01:06:00 miod Exp $ +dnl $OpenBSD: whatis,v 1.7 2004/03/17 09:25:10 jmc Exp $ OpenBSD/MACHINE OSREV was written under contract for Willowglen Singapore for an embedded application. Theo de Raadt, Dale Rahn, Chuck Cranor, and Steve Murphree were involved in working on this port which runs on -the MVME147, MVME162, MVME167, MVME177 and perhaps other models also. +the MVME147, MVME162, MVME167, MVME177, and perhaps other models also. diff --git a/distrib/notes/mvme88k/install b/distrib/notes/mvme88k/install index 0171fe98666..eb2ebaaf014 100644 --- a/distrib/notes/mvme88k/install +++ b/distrib/notes/mvme88k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.16 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: install,v 1.17 2004/03/17 09:25:10 jmc Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -38,7 +38,7 @@ to "go back" for some reason. After taking care of all that, the system should be brought down gracefully using the shutdown(8) and/or halt(8) commands, which will eventually go -bakc to the ``BUG>'' prompt (it may be necessary to send a break if the +back to the ``BUG>'' prompt (it may be necessary to send a break if the system is completely halted). @@ -86,12 +86,12 @@ Booting from Network: OpenBSD/MACHINE can boot off any network card supported by the BUG, even if the card itself is not supported by OpenBSD. Two network boot loaders are provided: one for Sun-compatible diskless setup (bootparams and NFS -root), and a simpler version limited to tftp support. +root), and a simpler version limited to TFTP support. The Sun-compatible network bootloader currently only supports the MVME187 -on-board interface, and will not be able to boot from any other ethernet +on-board interface, and will not be able to boot from any other Ethernet controller. The tftp bootloader does not have this limitation and will boot -from any BUG-supported ethernet controller. +from any BUG-supported Ethernet controller. If you plan to use the Sun-compatible bootloader, "netboot", it will be necessary to set up a complete diskless client configuration on a server. If @@ -104,11 +104,11 @@ SunOS systems, add_client(8) and the Sun System/Networks administrators guide constitute a good start; on Solaris systems, share(1M) is a good starting point as well). -Using the tftp-compatible bootloader, "tftpboot", only requires a tftp +Using the TFTP-compatible bootloader, "tftpboot", only requires a TFTP server to be installed on the network, with both the tftpboot file and the kernel image (usually bsd.rd) available from it. -The list of BUG-supported ethernet controllers is available with the +The list of BUG-supported Ethernet controllers is available with the "NIOT;A" command. For example: 187-Bug> NIOT;A @@ -187,7 +187,7 @@ from the server with the NBO command: 187-Bug> NBO 00 00 -or if you know the IP address for the MACHINE and the tftp server, +or if you know the IP address for the MACHINE and the TFTP server, you can directly provide the boot loader's filename and the kernel name on the commandline: diff --git a/distrib/notes/mvme88k/prep b/distrib/notes/mvme88k/prep index a96d75f99b7..5bce8553acc 100644 --- a/distrib/notes/mvme88k/prep +++ b/distrib/notes/mvme88k/prep @@ -1,8 +1,8 @@ -dnl $OpenBSD: prep,v 1.3 2003/09/06 23:34:01 miod Exp $ +dnl $OpenBSD: prep,v 1.4 2004/03/17 09:25:10 jmc Exp $ Before installing OpenBSD on your machine, you will want to check your machine's NVRAM settings, from the BUG. -The BUG provides a simple syntax reminder for every command, as well as +The BUG provides a simple syntax reminder for every command, as well as a description of the commands; if you need help, just use 187-Bug> HE @@ -20,7 +20,7 @@ with the SD command: 187-Diag> SD 187-Bug> -The defaults settings are usually suitable for OpenBSD; make sure the +The default settings are usually suitable for OpenBSD; make sure the environment is configured in BUG mode. You can check and change this with the ENV command. Ideally, the first two items of the ENV data will be as follows: @@ -33,7 +33,7 @@ in order to boot directly into the BUG, without executing the complete selftest sequence. Do not forget, after changing the ENV parameters, to save the changes in NVRAM as suggested by the ENV command itself. -If the board has a built-in ethernet controller, its address must be correct; +If the board has a built-in Ethernet controller, its address must be correct; the LSAD command allows the address to be edited. OpenBSD/MACHINE will not run correctly if the clock is stopped (power-saving diff --git a/distrib/notes/packages b/distrib/notes/packages index 412b67ee134..230f5dcf8cb 100644 --- a/distrib/notes/packages +++ b/distrib/notes/packages @@ -1,4 +1,4 @@ -dnl $OpenBSD: packages,v 1.34 2004/03/01 11:56:35 miod Exp $ +dnl $OpenBSD: packages,v 1.35 2004/03/17 09:25:09 jmc Exp $ As complete as your OpenBSD system is, you may want to add any of several excellent third party software applications. There are several ways to do this. You can: @@ -59,14 +59,14 @@ Installing applications from the ftp.OpenBSD.org package collection: http://www.OpenBSD.org/ftp.html - for a list of current ftp mirror sites. + for a list of current FTP mirror sites. Installation of a package is very easy. 1) become the superuser (root) 2) use the ``pkg_add'' command to install the software ``pkg_add'' is smart enough to know how to download the software - from the OpenBSD ftp server. Example: + from the OpenBSD FTP server. Example: $ su Password: <enter your root password> @@ -1185,7 +1185,7 @@ Installing applications from the ftp.OpenBSD.org package collection: Note: these packages may not exist for all architectures; other packages may be added. Some packages are only available via - ftp. + FTP. Installing applications from the CD-ROM ports collection: @@ -1196,7 +1196,7 @@ Installing applications from the CD-ROM ports collection: Creating an application from sources can require a lot of disk space, sometimes 50 megabytes or more. The first step is to determine which of your disks has enough room. Once you've - made this determination read the file PORTS located on the + made this determination, read the file PORTS located on the CD-ROM which contains the ports tree. To build an application you must: @@ -1278,7 +1278,7 @@ Installing other applications: manual page for more information about this.-:}) -:})dnl - If you can't find an existing port try to make your own and + If you can't find an existing port, try to make your own and feed it back to OpenBSD. That's how our ports collection grows. Some details can be found at http://www.OpenBSD.org/porting.html with more help coming from the mailing list, <ports@OpenBSD.org>. diff --git a/distrib/notes/pegasos/install b/distrib/notes/pegasos/install index c53d3952a3a..b587cdce45c 100644 --- a/distrib/notes/pegasos/install +++ b/distrib/notes/pegasos/install @@ -1,8 +1,8 @@ -dnl $OpenBSD: install,v 1.6 2004/02/07 14:28:32 miod Exp $ +dnl $OpenBSD: install,v 1.7 2004/03/17 09:25:10 jmc Exp $ OpenBSDInstallShortPrelude -Currently only MBR partitioning is supported, RDB support may be added -later, although RDB partitions are recognized. +Currently only MBR partitioning is supported; RDB support may be added +later, though RDB partitions are recognized. OpenBSDInstallPart2 @@ -11,7 +11,7 @@ OpenBSDInstallPart2 CD boot image, by network loading the bootloader or loading the bootloader and kernel from a MorphOS(?) partition. - OpenBSD can be booted directly from the FFS filesystem. + OpenBSD can be booted directly from an FFS filesystem. An MSDOS partition is not required. @@ -22,7 +22,7 @@ OpenBSDBootMsgs OpenBSDInstallPart3({:- or "wd0" for IDE/ATA drives-:}) - Next you will have to edit or create a disklabel for the disk + Next you will have to edit or create a disk label for the disk OpenBSD is being installed on. If there are any existing partitions defined (for any operating system), and a disk label is not found, you will first be given an opportunity to run @@ -30,7 +30,7 @@ OpenBSDInstallPart3({:- or "wd0" for IDE/ATA drives-:}) If fdisk is being invoked, it will start by displaying the current partitions defined and then allow you to modify this - information, add new partitions and change which partition to + information, add new partitions, and change which partition to boot from by default. If you make a mistake, you will be allowed to repeat this procedure as necessary to correct this. dnl XXX is this true? @@ -43,7 +43,7 @@ OpenBSDInstallPart4({:-If you have MorphOS If the disk is partitioned using MBR, the bootloader is automatically installed. However because fdisk is not LBA - knowledgeable it may be necessary to run the 'b' command in + knowledgeable, it may be necessary to run the 'b' command in disklabel to allow OpenBSD to use the entire disk. Note that all OpenBSD partitions in the disk label must have an diff --git a/distrib/notes/pegasos/prep b/distrib/notes/pegasos/prep index 1231215bea0..73a9e0653f8 100644 --- a/distrib/notes/pegasos/prep +++ b/distrib/notes/pegasos/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.6 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: prep,v 1.7 2004/03/17 09:25:10 jmc Exp $ To be able to boot the OpenBSD/MACHINE installation program, you will need to acquire some limited knowledge of OpenFirmware, the low-level process that controls the microprocessor after hardware initialization @@ -18,7 +18,7 @@ boot net:ofwboot /bsd.rd (on Pegasos I) boot net ofwboot /bsd.rd (on Pegasos II) (netboot from a pre-configured bootp/tftp/nfs server containing the "ofwboot" and "bsd.rd" - files at the root directory of the tftp server) + files at the root directory of the TFTP server) boot /dev/pci/ide/disk@0,0:3,ofwboot /bsd /bsd (After installation, boot /bsd from the primary @@ -66,13 +66,13 @@ on the boot line or in the boot-device variable, since it is the default. Sharing a disk with MorphOS: -It is not currently possible to share a disk with MorphOS, Amiga labeled +It is not currently possible to share a disk with MorphOS; Amiga labeled disks are recognized, but can't be modified to define new partitions at the moment. OpenBSD/MACHINE is capable of booting from a dedicated disk using a -MBR partitioned disk, CD containing an ISO image or a firmware supported -ethernet card. +MBR partitioned disk, a CD containing an ISO image, or a firmware supported +Ethernet card. For dedicated disks, the MACHINE port boots off a boot program in the FFS 'a' filesystem. This is set up by the install program diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware index ea6fb1da4ee..3499941eb2c 100644 --- a/distrib/notes/sparc/hardware +++ b/distrib/notes/sparc/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.60 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: hardware,v 1.61 2004/03/17 09:25:10 jmc Exp $ OpenBSD/MACHINE OSREV runs on the following classes of machines: * sun4: the VME series - 4/100: Original sparc with VME. Many hardware bugs. @@ -169,7 +169,7 @@ Supported devices {:-include-:}: - PCMCIA Controllers: + Sun SBus PCMCIA bridge (stp) + Tadpole PCMCIA controller (tslot) - - Wireless ethernet adapters (wi) + - Wireless Ethernet adapters (wi) + Compact Flash Adapters (will show up as PCMCIA adapters) Buffalo AirStation CF ELSA XI800 CF @@ -216,7 +216,7 @@ Supported devices {:-include-:}: TDK LAK-CD011WL PCMCIA US Robotics 2410 PCMCIA US Robotics 2445 PCMCIA - - NE2000-based ethernet Adapters + - NE2000-based Ethernet Adapters Accton EN2212, EN2216 Allied Telesis LA-PCM AmbiCom AMB8002T @@ -279,7 +279,7 @@ Supported devices {:-include-:}: OpenBSD/MACHINE OSREV does NOT run on these machines (yet): - Sun 4/400 Lacking support for the I/O cache, and related - ethernet problems. + Ethernet problems. - sun4d -- SPARCcenter 2000, SPARCserver 1000 XDBus and multiprocessor support issues. - sun4u (Ultrasparcs) diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install index 23d14405be4..cd85e8e5ece 100644 --- a/distrib/notes/sparc/install +++ b/distrib/notes/sparc/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.60 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: install,v 1.61 2004/03/17 09:25:10 jmc Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -7,8 +7,8 @@ be booted off your local disk's swap partition. The normal way is to use the OpenBSD CD-ROM, or the bootable CD-ROM mini image, or an installation floppy, or an installation tape, depending on your hardware. -If your Sparc is hooked up to a network and you can find a server to -arrange for a diskless setup, which is a convenient way to install on a +If your Sparc is hooked up to a network, try and find a server to +arrange for a diskless setup. This is a convenient way to install on a machine whose disk does not currently hold a usable operating system. This is difficult to get set up correctly the first time, but easy to use afterwards. (See ``Installing using a diskless setup'' below.) @@ -27,13 +27,13 @@ does not necessarily wipe out all the partitions on the hard disk, errors during the install process can have unforeseen consequences and you will probably render the system unbootable if you start, but do not complete the installation. Having the installation media for the prior installation, -be it a SunOS or OpenBSD CD-ROM or OpenBSD install diskettes is good +be it a SunOS or OpenBSD CD-ROM or OpenBSD install diskettes, is good insurance if you want to be able to "go back" for some reason. After taking care of all that, bring your system down gracefully using the shutdown(8) and/or halt(8) commands. This will get you to the monitor prompt. Sun PROM monitor commands and setup differ considerably depending -on the system architecture and age, you may needed to reference the PROM +on the system architecture and age; you may needed to reference the PROM monitor manual for your system for details. There are four main cases: @@ -58,7 +58,7 @@ enter the "n" command to enter the "new command mode". You can set this as the default by doing a "setenv sunmon-compat? false" command, followed by a "reset" command. -Note that OpenBoot Proms also do the Sun SCSI-ID shuffle for disks, this +Note that OpenBoot Proms also do the Sun SCSI-ID shuffle for disks; this is described elsewhere in some detail. For the purposes of this section, drive 0 refers to the internal or first SCSI drive, which usually has a SCSI-ID of 3. @@ -80,7 +80,7 @@ Booting from CD-ROM installation media: ok boot cdrom OSREV/MACHINE/bsd.rd # for version 2 OpenBOOT ROMs If the boot is successful, you will get a loader version message, -executable sizes and then the kernel copyright and device probe +executable sizes, and then the kernel copyright and device probe messages. Boot failure modes are typically a lot of CD-ROM drive activity, but no messages or complaints about magic numbers, checksums or formats. @@ -103,7 +103,7 @@ Boot the miniroot by typing the appropriate command at the PROM: If you've loaded the miniroot onto some other disk than the default drive 0, modify the boot specifier accordingly, keeping in mind the -drive vs. scsi-id shuffling and partition a=0, b=1... +drive vs. SCSI-ID shuffling and partition a=0, b=1... > b sd(0,10,1)bsd # example - scsi target 2 on sun4 monitors* ok boot sd(0,3,1)bsd # example - scsi target 0 on v1 OpenBOOT ROM @@ -127,7 +127,7 @@ Boot the miniroot by typing the appropriate command at the PROM: # that won't take tape:n syntax. The above instructions assume your tape drive is the default tape drive -using SCSI id 4. If your drive uses id 5, modify the boot command +using SCSI ID 4. If your drive uses ID 5, modify the boot command accordingly: > b st(,28,1) # example - 2nd tape drive on sun4 monitors @@ -142,7 +142,7 @@ accordingly: Installing using a diskless setup: First, you must set up a diskless client configuration on a server. If -you are using a OpenBSD system as the boot-server, have a look at the +you are using an OpenBSD system as the boot-server, have a look at the diskless(8) manual page for guidelines on how to proceed with this. If the server runs another operating system, you'll have to consult documentation that came with it (on SunOS systems, add_client(8) and @@ -185,7 +185,7 @@ OpenBSDBootMsgs installing from a keyboard/monitor console, the default of "sun" is correct. If you are installing from a serial console you should choose the terminal type from amongst those listed. - (If your terminal type is xterm, just use vt100). + (If your terminal type is xterm, just use vt100.) OpenBSDInstallPart3 @@ -211,7 +211,7 @@ OpenBSDCommonURL After completing an installation: -Now try a reboot. (If needed, swap your scsi id's first). +Now try a reboot. (If needed, swap your SCSI IDs first.) The Sun monitor normally tries to load a file called "vmunix". On OpenBOOT ROM systems you can change it to load OpenBSD instead using the following commands: @@ -256,7 +256,7 @@ least the following pieces: (e.g. sun4m or sun4c) - an OpenBSD kernel, most likely "/bsd" -All these pieces, except "/boot" and the GNU utilities are supplied in +All these pieces, except "/boot" and the GNU utilities, are supplied in the OpenBSD/MACHINE distribution. You need to format and partition the disk using SunOS (since @@ -307,7 +307,7 @@ The installboot man page says to do something like this: sunos# sync; sync sunos# /usr/mdec/installboot -vlt /mnt/boot /usr/mdec/bootsd /dev/rsd2a -You can now extract the provided "*.tgz files onto your disk. +You can now extract the provided "*.tgz" files onto your disk. sunos# ls -FC base{:--:}OSrev.tgz comp{:--:}OSrev.tgz man{:--:}OSrev.tgz xfont{:--:}OSrev.tgz @@ -346,11 +346,11 @@ also need at least the following pieces: for ufs filesystem, such as /usr/platform/`uname -i`/lib/fs/ufs/bootblk - an OpenBSD kernel, most likely "/bsd" -All these pieces, except the boot block and the GNU utilities are supplied +All these pieces, except the boot block and the GNU utilities, are supplied in the OpenBSD/MACHINE distribution. You need to format and partition the disk using Solaris (since -OpenBSD/MACHINE uses Sun compatible disk labels.) Give yourself adequate +OpenBSD/MACHINE uses Sun compatible disk labels). Give yourself adequate partition sizes. Here is an example layout: solaris# prtvtoc -s /dev/rdsk/c0t1d0s2 @@ -365,7 +365,7 @@ partition sizes. Here is an example layout: 6 4 00 936000 3229271 4165270 /usr Use Solaris to newfs the partitions which will have filesystems on them. -(OpenBSD's filesystem format is almost identical to Solaris). +(OpenBSD's filesystem format is almost identical to Solaris.) solaris# newfs /dev/rdsk/c0t1d0s0 [... lots of output] @@ -400,7 +400,7 @@ The installboot man page says to do something like this: solaris# sync; sync solaris# /usr/sbin/installboot /mnt/bootblk /dev/rdsk/c0t1d0s0 -You can now extract the provided "*.tgz files onto your disk. +You can now extract the provided "*.tgz" files onto your disk. solaris# ls -FC base{:--:}OSrev.tgz comp{:--:}OSrev.tgz man{:--:}OSrev.tgz xfont{:--:}OSrev.tgz @@ -443,7 +443,7 @@ program via TFTP after having acquired its IP address through RevARP when instructed to boot "over the net". It will look for a filename composed of the machine's IP address followed by the machine's architecture, separated by a period. For example, a sun4c machine which has been assigned IP -address 130.115.144.11, will make an TFTP request for `8273900B.SUN4C'. +address 130.115.144.11, will make a TFTP request for `8273900B.SUN4C'. Normally, this file is a symbolic link to an appropriate second-stage boot program, which should be located in a place where the TFTP daemon can find it (remember, many TFTP daemons run in a chroot'ed environment). @@ -485,7 +485,7 @@ kernel which is then read into memory. You will want export the miniroot{:--:}OSrev.fs filesystem to the client. You can dd this filesystem image to some spare partition, mount and export -that partition or use tar to copy the contents to a more convenient spot. +that partition, or use tar to copy the contents to a more convenient spot. Alternatively you can build a bootable partition from the distribution sets as follows: diff --git a/distrib/notes/sparc/prep b/distrib/notes/sparc/prep index 22082584e99..a94fdb3287a 100644 --- a/distrib/notes/sparc/prep +++ b/distrib/notes/sparc/prep @@ -15,24 +15,24 @@ this table: 6 sd6 Unlike SunOS and the OpenBOOT ROM, a generic OpenBSD kernel numbers -scsi drives sequentially as it finds them. The drive with the -lowest scsi-id will be called sd0, the next one sd1, etc. +SCSI drives sequentially as it finds them. The drive with the +lowest SCSI-ID will be called sd0, the next one sd1, etc. To ease the installation process, two OpenBSD kernels are provided in the installation sets. The default OpenBSD kernel (bsd) is set up to use the OpenBSD mapping, while a special kernel (bsd.scsi3) is -set up to match the Sun mapping above by hard-wiring scsi-id#3 to sd0 -and scsi-id#0 to sd3. The remaining drives will be dynamically mapped +set up to match the Sun mapping above by hard-wiring SCSI-ID#3 to sd0 +and SCSI-ID#0 to sd3. The remaining drives will be dynamically mapped to other sd* numbers. This is mostly a non-issue if you have only one drive on your system, but can get confusing if you have multiple drives. If you plan -to eliminate SunOS altogether it may be best to correct the scsi-id's +to eliminate SunOS altogether it may be best to correct the SCSI-IDs of your drives, while if you plan to leave SunOS installed, it may -be better to install OpenBSD on a drive with scsi-id 1 or 0. +be better to install OpenBSD on a drive with SCSI-ID 1 or 0. Older OpenBoot proms (versions 1.x) provide an environment variable, -sd-targets, that controls the drive<->scsi-id mapping, you can change +sd-targets, that controls the drive<->SCSI-ID mapping; you can change this to reflect the natural ordering or just set the boot related variables to boot from the correct drive, whatever the numbering. Its default-value is ``31204567'', which means unit 0 and 3 are exchanged. @@ -41,7 +41,7 @@ To revert to the ``normal'' behaviour, enter the following command: ok setenv sd-targets 01234567 NOTE: if you elect to build a custom kernel you may want to "hardwire" -the scsi-id's to sd0->scsi-id 0 or your desired scheme, this helps +the SCSI-IDs to sd0->SCSI-ID 0 or your desired scheme, this helps prevent accidents if you change the SCSI bus configuration or a drive is down. @@ -68,7 +68,7 @@ Make sure that the ROM security modes are disabled: Please note that while OpenBSD and SunOS have a reasonable degree of -compatibility between disk labels and filesystems there are some problems +compatibility between disk labels and filesystems, there are some problems to watch out for during initial installation or when trying to maintain both OpenBSD and SunOS environments on the same system. @@ -100,7 +100,7 @@ OpenBSD partitions. OpenBSD and Sun BSD bootblocks are similar in concept, though implemented differently. The OpenBSD bootblocks are architecture independent and also -understand the extended disklabels with 16 partitions. You can use SunOS +understand the extended disk labels with 16 partitions. You can use SunOS bootblocks, but remember that OpenBSD bootblocks must be installed with OpenBSD installboot and SunOS bootblocks with SunOS installboot. diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer index 1591dae6204..ab2e8a2e9f0 100644 --- a/distrib/notes/sparc/xfer +++ b/distrib/notes/sparc/xfer @@ -1,4 +1,4 @@ -dnl $OpenBSD: xfer,v 1.37 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: xfer,v 1.38 2004/03/17 09:25:10 jmc Exp $ Installation is supported from several media types, including: CD-ROM @@ -16,7 +16,7 @@ not all sparc systems support booting from CD-ROM, and the current boot image is only known to work on sun4c and sun4m architecture workstations. If you can boot from the CD-ROM, you are home free and can proceed to the installation steps. If not, you will need to do some setup work to prepare -a bootable image, either a floppy, hard drive, tape, or compatible net boot +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 @@ -42,11 +42,11 @@ Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system: single user mode), and then booting from that partition. Using the "b" partition allows you to boot without overwriting - any useful parts of the disk, you can also use another partition, + any useful parts of the disk; you can also use another partition, but don't use the "a" or "c" partition without understanding - the disklabel issues described below under "incompatible systems". + the disk label issues described below under "incompatible systems". - This requires that you be running SunOS, Solaris, OpenBSD or NetBSD + This requires that you be running SunOS, Solaris, OpenBSD, or NetBSD, which have a compatible view of SunOS disk labels and partitions. Use the dd(1) utility to copy the file to the hard drive. @@ -68,9 +68,9 @@ Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system: don't care about the hard disk contents, you can also install the bootable image starting at the beginning of the disk. This lets you prepare a bootable hard-drive even if don't have a working - operating system on your Sparc, but it important to understand + operating system on your Sparc, but it is important to understand that the bootable image installed this way includes a "disk label" - which can wipe out any pre-existing disklabels or partitioning for + which can wipe out any pre-existing disk labels or partitioning for the drive. The floppy image is used only for booting, and can be placed in @@ -115,7 +115,7 @@ Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system: dd if=floppy{:--:}OSrev.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 + In either case, you've created a situation where the disk label and the filesystem information don't agree about the partition size and geometry, however the results will be usable. diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents index fea29a74833..dd3c7884012 100644 --- a/distrib/notes/sparc64/contents +++ b/distrib/notes/sparc64/contents @@ -1,9 +1,9 @@ -dnl $OpenBSD: contents,v 1.26 2003/09/09 22:29:05 miod Exp $ +dnl $OpenBSD: contents,v 1.27 2004/03/17 09:25:10 jmc Exp $ TopPart OpenBSDminiroot It can be copied to the swap partition of - an existing OpenBSD, Solaris, NetBSD or Linux + an existing OpenBSD, Solaris, NetBSD, or Linux installation to allow installing or upgrading to OpenBSD OSREV. diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware index 1d0063a8ff5..162f8aa8b5b 100644 --- a/distrib/notes/sparc64/hardware +++ b/distrib/notes/sparc64/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.63 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: hardware,v 1.64 2004/03/17 09:25:10 jmc Exp $ OpenBSD/MACHINE OSREV runs on the following classes of machines: - SBUS based workstations: Ultra 1 @@ -68,8 +68,8 @@ Supported devices {:-include-:}: Most ATAPI CD-ROM, CD-R, CD-RW, DVD and DVD-RW drives Ethernet Adapters: - onboard AMD Lance ethernet (le) - SBus AMD Lance ethernet cards (le) + onboard AMD Lance Ethernet (le) + SBus AMD Lance Ethernet cards (le) SBus 10/100MBit Sun FastEthernet 1.0 cards (qec/be) SBus Quad 10MBit Sun QuadEthernet cards (qec/qe) onboard SBus/PCI HME Ethernet cards (hme) @@ -166,7 +166,7 @@ Supported devices {:-include-:}: Bluesteelnet 5501/5601 (ubsec) Broadcom 5801/5802/5805/5820/5821/5822/5823 (ubsec) - Keyboard and mices: + Keyboard and mice: Type 4, 5 and 6 keyboards on Zilog serial ports (zskbd) Type 4, 5 and 6 keyboards on NS16550 serial ports (comkbd) Type 6 keyboards on USB (ukbd) @@ -189,8 +189,8 @@ Supported devices {:-include-:}: PC Cards (PCMCIA): PCMCIA Controllers: - SBus pcmcia bridge (stp) - Wireless ethernet adapters: + SBus PCMCIA bridge (stp) + Wireless Ethernet adapters: See above. Miscellaneous devices: diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install index f977f234d4a..ef77d4a21ba 100644 --- a/distrib/notes/sparc64/install +++ b/distrib/notes/sparc64/install @@ -1,14 +1,14 @@ -dnl $OpenBSD: install,v 1.33 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: install,v 1.34 2004/03/17 09:25:10 jmc Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way in terms of preliminary setup is to use the OpenBSD installation dnl XXX change back if more than one floppy again. -dnl cdrom, or an installation floppy. -cdrom, or the installation floppy. +dnl CD-ROM, or an installation floppy. +CD-ROM, or the installation floppy. -If your machine is hooked up to a network and you can find a server to -arrange for a diskless setup, which is a convenient way to install on a +If your machine is hooked up to a network, try and find a server to +arrange for a diskless setup. This is a convenient way to install on a machine whose disk does not currently hold a usable operating system. This is difficult to get set up correctly the first time, but easy to use afterwards. (See ``Installing using a diskless setup'' below.) @@ -19,9 +19,9 @@ Solaris'' below. On Blade100 systems you must use a serial console if you want to install or upgrade using the network. There is currently a problem that causes the -system to crash if you attempt an ftp or http install while the keyboard -and a monitor are attached. Simply unplug the keyboard, connect the serial -port to the system you will use as the console and reboot. There is no +system to crash if you attempt an FTP or HTTP install while the keyboard +and monitor are attached. Simply unplug the keyboard, connect the serial +port to the system you will use as the console, and reboot. There is no problem with normal operation over the network once the install or upgrade is complete. @@ -34,7 +34,7 @@ does not necessarily wipe out all the partitions on the hard disk, errors during the install process can have unforeseen consequences and you will probably render the system unbootable if you start, but do not complete the installation. Having the installation media for the prior installation, -be it a Solaris or OpenBSD CD-ROM or OpenBSD install diskettes is good +be it a Solaris or OpenBSD CD-ROM or OpenBSD install diskettes, is good insurance if you want to be able to "go back" for some reason. After taking care of all that, bring your system down gracefully using @@ -48,7 +48,7 @@ Booting from Floppy Disk installation media: This will cause the kernel contained in the floppy to be booted. Please note that PCI systems are not able to boot from floppy; also, -Ultra 1, 1E and 2 systems might need a firmware update to be able to boot +Ultra 1, 1E, and 2 systems might need a firmware update to be able to boot from floppy; refer to the ``Updating your firmware'' section earlier in this document for details. @@ -59,7 +59,7 @@ dnl No args! not a typo ok boot cdrom If the boot is successful, you will get a loader version message, -executable sizes and then the Kernel copyright and device probe +executable sizes, and then the kernel copyright and device probe messages. Boot failure modes are typically a lot of CD-ROM drive activity, but no messages or complaints about magic numbers, checksums or formats. @@ -91,7 +91,7 @@ does not use swap, it doesn't matter. Installing using a diskless setup: First, you must set up a diskless client configuration on a server. If -you are using a OpenBSD system as the boot-server, have a look at the +you are using an OpenBSD system as the boot-server, have a look at the diskless(8) manual page for guidelines on how to proceed with this. If the server runs another operating system, you'll have to consult documentation that came with it (on SunOS systems, add_client(8) and @@ -134,7 +134,7 @@ OpenBSDBootMsgs installing from a keyboard/monitor console, the default of "sun" is correct. If you are installing from a serial console you should choose the terminal type from amongst those listed. - (If your terminal type is xterm, just use vt100). + (If your terminal type is xterm, just use vt100.) OpenBSDInstallPart3({:- or "wd0" for IDE drives-:}) @@ -160,7 +160,7 @@ OpenBSDCommonURL After completing an installation: -Now try a reboot. (If needed, swap your scsi id's first). +Now try a reboot. (If needed, swap your SCSI IDs first). The UltraSPARC OpenFirmware will normally load the kernel from the device and filename as instructed by the ``boot-device'' and ``boot-file'' @@ -201,7 +201,7 @@ All these pieces, except gunzip, are supplied in the OpenBSD/MACHINE distribution. You need to format and partition the disk using Solaris (since -OpenBSD/MACHINE uses Sun compatible disk labels.) Give yourself adequate +OpenBSD/MACHINE uses Sun compatible disk labels). Give yourself adequate partition sizes. Here is an example layout: solaris# prtvtoc -s /dev/rdsk/c0t1d0s2 @@ -216,7 +216,7 @@ partition sizes. Here is an example layout: 6 4 00 936000 3229271 4165270 /usr Use Solaris to newfs the partitions which will have filesystems on them. -(OpenBSD's filesystem format is almost identical to Solaris). +(OpenBSD's filesystem format is almost identical to Solaris.) solaris# newfs /dev/rdsk/c0t1d0s0 [... lots of output] @@ -251,7 +251,7 @@ The installboot man page says to do something like this: solaris# sync; sync solaris# /usr/sbin/installboot /mnt/bootblk /dev/rdsk/c0t1d0s0 -You can now extract the provided "*.tgz files onto your disk. +You can now extract the provided "*.tgz" files onto your disk. solaris# ls -FC base{:--:}OSrev.tgz etc{:--:}OSrev.tgz misc{:--:}OSrev.tgz xserv{:--:}OSrev.tgz @@ -293,7 +293,7 @@ Your UltraSPARC expects to be able to download a second stage bootstrap program via TFTP after having acquired its IP address through RevARP when instructed to boot "over the net". It will look for a filename composed of the machine's IP address. For example, a machine which has been assigned IP -address 130.115.144.11, will make an TFTP request for `8273900B'. +address 130.115.144.11 will make a TFTP request for `8273900B'. Normally, this file is a symbolic link to an appropriate second-stage boot program, which should be located in a place where the TFTP daemon can find it (remember, many TFTP daemons run in a chroot'ed environment). @@ -318,7 +318,7 @@ kernel which is then read into memory. You will want export the miniroot{:--:}OSrev.fs filesystem to the client. You can dd this filesystem image to some spare partition, mount and export -that partition or use tar to copy the contents to a more convenient spot. +that partition, or use tar to copy the contents to a more convenient spot. Alternatively you can build a bootable partition from the distribution sets as follows: diff --git a/distrib/notes/sparc64/prep b/distrib/notes/sparc64/prep index 79b171f2a24..eeb1d0bf36e 100644 --- a/distrib/notes/sparc64/prep +++ b/distrib/notes/sparc64/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.15 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: prep,v 1.16 2004/03/17 09:25:10 jmc Exp $ If your UltraSPARC machine is somewhat old, it might need a firmware update before it can be used under OpenBSD. You are advised to try to install OpenBSD first; if it can't boot or fails mysteriously, you might need to @@ -20,7 +20,7 @@ both OpenBSD and Solaris environments on the same system. set OpenBSD "clean flags" and BSD4.4 summary fields in the superblock. Solaris does *not* like this and you will have to do a "fsck -b 32" under Solaris to access an alternate superblock to repair the filesystem. You - should always specify Solaris filesystem with a "pass number" of 0 in + should always specify Solaris filesystems with a "pass number" of 0 in their /etc/fstab entry to prevent this, and preferably mount them "RO". If Solaris fsck is used on an OpenBSD filesystem in the default OpenBSD @@ -44,7 +44,7 @@ OpenBSD partitions. OpenBSD and Sun bootblocks are similar in concept, though implemented differently. The OpenBSD bootblocks are architecture independent and also -understand the extended disklabels with 16 partitions. You can use Solaris +understand the extended disk labels with 16 partitions. You can use Solaris bootblocks, but remember that OpenBSD bootblocks must be installed with OpenBSD installboot and Solaris bootblocks with Solaris installboot. @@ -66,7 +66,7 @@ If OpenBSD does not boot or install properly on your machine, it might need a firmware update. Updating your firmware is a dangerous operation which may damage your -hardware. Be sure to follow carefully these instructions, and if in doubt, +hardware. Be sure to carefully follow these instructions and, if in doubt, please don't do this. You will need to have a working operating system installed on your machine, diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer index 73d48465bd8..606b822c05b 100644 --- a/distrib/notes/sparc64/xfer +++ b/distrib/notes/sparc64/xfer @@ -1,4 +1,4 @@ -dnl $OpenBSD: xfer,v 1.20 2004/03/16 08:25:00 jmc Exp $ +dnl $OpenBSD: xfer,v 1.21 2004/03/17 09:25:10 jmc Exp $ Installation is supported from several media types, including: CD-ROM (NOT supported if booting from floppy) @@ -36,11 +36,11 @@ Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system: partition. Using the "b" partition allows you to boot without overwriting - any useful parts of the disk, you can also use another partition, + any useful parts of the disk; you can also use another partition, but don't used the "a" or "c" partition without understanding - the disklabel issues described below under "incompatible systems". + the disk label issues described below under "incompatible systems". - This requires that you be running SunOS, Solaris, OpenBSD or NetBSD + This requires that you be running SunOS, Solaris, OpenBSD, or NetBSD, which have a compatible view of SunOS disk labels and partitions. Use the dd(1) utility to copy the file to the hard drive. @@ -58,7 +58,7 @@ Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system: don't care about the hard disk contents, you can also install the bootable image starting at the beginning of the disk. This lets you prepare a bootable hard-drive even if don't have a working - operating system on your machine, but it important to understand + operating system on your machine, but it is important to understand that the bootable image installed this way includes a "disk label" which can wipe out any pre-existing disklabels or partitioning for the drive. diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install index fff78ff3b59..7a5828947b0 100644 --- a/distrib/notes/vax/install +++ b/distrib/notes/vax/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.15 2002/12/30 11:13:01 miod Exp $ +dnl $OpenBSD: install,v 1.16 2004/03/17 09:25:10 jmc Exp $ OpenBSDInstallPrelude For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via @@ -23,12 +23,12 @@ on diskless booting can be found in the OpenBSD diskless(8) manual page. When you turn on your VAX, it will run an extensive and model specific set of self-diagnostic ROM routines. When it is done, you should see a >>> prompt (also called the chevron prompt) on the console. Typing "show dev" -or "show ethernet" to get the VAX ethernet device's MAC address usually +or "show ethernet" to get the VAX Ethernet device's MAC address usually works; also try "TEST 50" on MicroVAXen 2000 and 3100. You will need to create an /etc/ethers file on the bootserver. This file -will be used by rarpd to answer rarp (ethernet address->IP address) requests. -The format of this file is the ethernet address followed by the machine +will be used by rarpd to answer rarp (Ethernet address->IP address) requests. +The format of this file is the Ethernet address followed by the machine name or address. Here is an example: 08:00:2b:24:72:00 quickvax @@ -40,10 +40,10 @@ entry in /etc/hosts. Then start rarpd (or configure /etc/rc.conf to always start rarpd). Copy boot.mop into /tftpboot/mop/1a2b3c4d5e6f.SYS, where "1a2b3c4d5e6f" -represents the six octets of your ethernet address. For example, the +represents the six octets of your Ethernet address. For example, the filename for the machine described above would be "08002b247200.SYS". Note that all non alphanumeric characters must be stripped and the -mac portion must be lower case, the extension upper. Start mopd by +MAC portion must be lower case, the extension upper. Start mopd by typing "mopd -a", if you've not configured it to run by default. Next you need to export a directory for your new machine to mount over @@ -68,7 +68,7 @@ or by running it manually. You are now ready to mopboot your MACHINE. -Typing "B <DEVICE>", where <DEVICE> is your VAX's ethernet device, at the +Typing "B <DEVICE>", where <DEVICE> is your VAX's Ethernet device, at the chevron prompt should then load the OpenBSD booter. @@ -96,7 +96,7 @@ OpenBSDBootMsgs dnl uncomment once display console is available dnl If you are installing from a serial console you should choose dnl the terminal type from amongst those listed. -dnl (If your terminal type is xterm, just use vt100). +dnl (If your terminal type is xterm, just use vt100.) Just hit return to select the default (vt100). OpenBSDInstallPart3 |