summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/help
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/sysinstall/help')
-rw-r--r--usr.sbin/sysinstall/help/configure.hlp8
-rw-r--r--usr.sbin/sysinstall/help/distributions.hlp41
-rw-r--r--usr.sbin/sysinstall/help/drives.hlp4
-rw-r--r--usr.sbin/sysinstall/help/media.hlp58
-rw-r--r--usr.sbin/sysinstall/help/network_device.hlp72
-rw-r--r--usr.sbin/sysinstall/help/options.hlp114
-rw-r--r--usr.sbin/sysinstall/help/partition.hlp196
-rw-r--r--usr.sbin/sysinstall/help/slice.hlp61
-rw-r--r--usr.sbin/sysinstall/help/usage.hlp56
9 files changed, 359 insertions, 251 deletions
diff --git a/usr.sbin/sysinstall/help/configure.hlp b/usr.sbin/sysinstall/help/configure.hlp
index 49980d4..d7473e6 100644
--- a/usr.sbin/sysinstall/help/configure.hlp
+++ b/usr.sbin/sysinstall/help/configure.hlp
@@ -3,12 +3,8 @@ process is complete. At the minimum, you should probably set the
system manager's password and the system time zone.
For extra goodies like bash, emacs, pascal, etc., you should look at
-the Packages item in this menu. Currently, the Packages option is
-only useful if you have a CDROM or an existing packages collection
-somewhere in the file system hierarchy where the package management
-tool can locate it. The automatic transfer of packages via FTP is not
-yet supported!
+the Packages item in this menu.
For setting the timezone after the system is installed, type
-``tzsetup''. For more information on the general system
+``tzsetup''. For more information on the overall general system
configuration, see the ``/etc/sysconfig'' file.
diff --git a/usr.sbin/sysinstall/help/distributions.hlp b/usr.sbin/sysinstall/help/distributions.hlp
index b81efbf..b614937 100644
--- a/usr.sbin/sysinstall/help/distributions.hlp
+++ b/usr.sbin/sysinstall/help/distributions.hlp
@@ -1,5 +1,5 @@
An ``X-'' prefixed before a distribution set means that the XFree86
-3.1.1u1 base distribution, libraries, manual pages, SVGA server and a
+3.1.2-S base distribution, libraries, manual pages, SVGA server and a
set of default fonts will be selected in addition to the set itself.
If you select such a set, you will also be presented with a set of
@@ -9,37 +9,32 @@ setup.
N.B. All references in this document to `complete source' mean the
complete source tree minus any legally encumbered cryptography code.
-The current "canned" installations are as follows:
+The current "canned" installations are provided:
Developer: Base ("bin") distribution, man pages, dictionary
files, profiling libraries and the complete source tree.
-
Kern-Developer: As above, but with only kernel sources instead of
the complete source tree.
-
User: The base distribution, man pages, dictionary files and
the FreeBSD 1.x and 2.0 compatibility sets.
-
Minimal: Only the base distribution.
-
Everything: The base distribution, man pages, dictionary files,
profiling libraries, the FreeBSD 1.x and the FreeBSD 2.0
compatibility libraries, the complete source tree,
games and your choice of XFree86 distribution components.
- N.B. Still no cryptocraphy source code!
-
+ Note that the cryptocraphy source code is NOT included
+ in this collection. You will need to select that by
+ hand if you're inside the United States.
Custom: Allows you to modify or create your distribution set on
a piece-by-piece basis.
-
Reset: Clear all currently selected distributions.
-
---
When using Custom, most of the sub-distribution choices are fairly
@@ -51,15 +46,6 @@ obvious, though two possible exceptions may be the "commerce" and
under special arrangement, limited functionality demos, shareware
products (you like it, you buy it), etc.
- At the time of this writing, there are unfortunately not enough
- commercial offerings to justify a fully split distribution set,
- so each product is available both as a subdirectory and as part
- of one large archive file. If you select "commerce" from the
- distributions submenus then you'll get the big file containing
- the entire collection copied to your hard disk. Don't do this
- unless you've got at least 10MB to devote to it!
-
-
* The "xperimnt" directory contains, not surprisingly, experimental
offerings. Unfinished (or work-in-progress) features, special
purpose drivers and packages, strange proof-of-concept stuff,
@@ -74,15 +60,18 @@ obvious, though two possible exceptions may be the "commerce" and
You may also notice that certain distributions, like "des" and "krb",
-are marked "NOT FOR EXPORT!" This is because it's illegal to
-export them from the United States (or any other country which
-considers encryption technology to be on its restricted export
-list). Since breaking this law only gets the _originating_ site
-(US!) in trouble, please do not load these distributions from U.S.
-servers!
+are marked "NOT FOR EXPORT!" This is because it's illegal to export
+them from the United States (or any other country which considers
+encryption technology to be on its restricted export list). Since
+breaking this law only gets the _originating_ site (US!) in trouble,
+please do not load these distributions from U.S. servers! We don't
+like these restrictions any more than you do, but can't do much about
+it (write your U.S. congressperson!).
A number of "foreign" servers do exist for the benefit of
-non-U.S. sites, one of which is "skeleton.mikom.csir.co.za".
+non-U.S. sites, the official site being:
+
+ ftp://ftp.internat.freebsd.org/pub/FreeBSD
Please get all such export restricted software from there
if you are outside the U.S., thanks!
diff --git a/usr.sbin/sysinstall/help/drives.hlp b/usr.sbin/sysinstall/help/drives.hlp
index ef1c4fe..27e2e75 100644
--- a/usr.sbin/sysinstall/help/drives.hlp
+++ b/usr.sbin/sysinstall/help/drives.hlp
@@ -1,7 +1,7 @@
If you are going to actually install some portion of FreeBSD on a
drive then PLEASE BE VERY CERTAIN that the Geometry reported in the
-Partition Editor (see Installation Menu) is the correct one for your
-drive and controller combination!
+Partition Editor is the correct one for your drive and controller
+combination!
IDE drives often have a certain geometry set during the PC BIOS setup,
or (in the case of larger IDE drives) have their geometry "remapped"
diff --git a/usr.sbin/sysinstall/help/media.hlp b/usr.sbin/sysinstall/help/media.hlp
index 8b081bc..dbf7d9b 100644
--- a/usr.sbin/sysinstall/help/media.hlp
+++ b/usr.sbin/sysinstall/help/media.hlp
@@ -1,29 +1,49 @@
You can install from the following types of media:
- CDROM - requires one of the following supported CDROM drives:
+ CDROM requires one of the following supported CDROM drives:
+ Sony CDU 31/33A
+ Matushita/Panasonic "Sound Blaster" CDROM.
+ Mitsumi FX-001{A-D} (older non-IDE drives).
+ SCSI - Any standard SCSI CDROM drive hooked to
+ a supported controller (see Hardware Guide).
- Sony CDU 31/33A
- Matushita/Panasonic "Sound Blaster" CDROM.
- Mitsumi FX-001{A-D} (older non-IDE drives).
- SCSI - Any standard SCSI CDROM drive hooked to
- a supported controller (see Hardware Guide).
- DOS - A DOS primary partition with the required FreeBSD
- distribution files copied onto it (e.g. C:\FREEBSD\)
+ DOS A DOS primary partition with the required FreeBSD
+ distribution files copied onto it (e.g. C:\FREEBSD\)
- FS - Assuming a disk or partition with an existing
- FreeBSD file system and distribution set on it,
- get the distribution files from there.
- Floppy - Get distribution files from one or more DOS formatted
- floppies.
+ FS Assuming a disk or partition with an existing
+ FreeBSD file system and distribution set on it,
+ get the distribution files from there.
- FTP - Get the distribution files from an anonymous ftp server
- (you will be presented with a list).
- NFS - Get the distribution files from an NFS server somewhere
- (make sure that permissions on the server allow this!)
+ Floppy Get distribution files from one or more DOS or UFS
+ formatted floppies.
- Tape - Extract distribution files from tape into a temporary
- directory and install from there.
+ FTP Get the distribution files from an anonymous ftp server
+ (you will be presented with a list). Please note that
+ there are also two ways of invoking FTP in either
+ "Active" and "Passive" mode.
+
+ Active mode is the standard way of fetching files and
+ Passive mode is for use when you're behind a firewall or
+ some other security mechanism that blocks active FTP
+ connections. If you chose "other" in the FTP menu, please
+ also note that all paths are *relative* to the home
+ directory of the user being logged in as. By default, this
+ is the user "ftp" (anonymous ftp) but you may change this
+ in the Options screen.
+
+
+ NFS Get the distribution files from an NFS server somewhere
+ (make sure that permissions on the server allow this!).
+ If this install method hangs on you or refuses to work
+ properly, you may need to set some special options for
+ your NFS server. See the Options screen for more details.
+
+
+ Tape Extract distribution files from tape into a temporary
+ directory and install from there. If the tape was created
+ with blocksize other than 20, you may wish to change this
+ in the Options screen.
diff --git a/usr.sbin/sysinstall/help/network_device.hlp b/usr.sbin/sysinstall/help/network_device.hlp
index 95c42ae..81bf6f2 100644
--- a/usr.sbin/sysinstall/help/network_device.hlp
+++ b/usr.sbin/sysinstall/help/network_device.hlp
@@ -2,53 +2,55 @@ You can do network installations over 3 types of communications links:
Serial port: SLIP / PPP
Parallel port: PLIP (laplink cable)
- Ethernet: A standard ethernet controller (includes some PCMCIA).
+ Ethernet: A standard ethernet controller (includes some
+ PCMCIA networking cards).
-SLIP support is rather primitive and limited primarily to hard-wired
-links, such as a serial cable running between a laptop computer and
-another PC. The link must be hard-wired as the SLIP installation
-doesn't currently offer a dialing capability; that facility is provided
-with the PPP utility, which should be used in preference to SLIP
-whenever possible. When you choose a serial port device, you'll
-be given the option later to edit the slattach command before it's
-run on the serial line. It is expected that you'll run slattach
-(or some equivalent) on the other end of the link at this time and
-bring up the line. FreeBSD will then install itself over the link
-at speeds of up to 115.2K/baud (the recommended speed for a hardwired
-cable).
+SLIP support is rather primitive and limited primarily to directly
+connected links, such as a serial cable running between a laptop
+computer and another PC. The link must be hard-wired as the SLIP
+installation doesn't currently offer a dialing capability (that
+facility is offered by the PPP utility, which should be used in
+preference to SLIP whenever possible). When you choose the SLIP
+option, you'll be given the option of later editing the slattach
+command before it's run on the serial line. It is expected that
+you'll run slattach (or some equivalent command) on the other end of
+the link at that time and bring up the line. FreeBSD will then
+install itself at serial speeds of up to 115.2K/baud (the recommended
+speed for a hardwired cable).
-If you're using a modem then PPP is almost certainly your only
-choice. Make sure that you have your service provider's information
-handy as you'll need to know it fairly early in the installation
-process. You will need to know, at the minimum, your service
-provider's IP address and possibly your own (though you can also leave
-it blank and allow PPP to negotiate it with your ISP). You will also
-need to know how to use the various "AT commands" to dial the ISP with
-your particular brand of modem as the PPP dialer provides only a very
-simple terminal emulator and has no "modem capabilities database".
+If you're using a modem then PPP is almost certainly your only choice.
+Make sure that you have your service provider's information handy as
+you'll need to know it fairly early in the installation process. You
+will need to know, at the minimum, your service provider's IP address
+and possibly your own (though you can also leave it blank and allow
+PPP to negotiate it with your ISP if your ISP supports such dynamic
+negotiation). You will also need to know how to use the various "AT
+commands" to dial the ISP with your particular brand of modem as the
+PPP dialer provides only a very simple terminal emulator and has no
+"modem capabilities database".
If a hard-wired connection to another FreeBSD (2.0R or later) machine
is available, you might also consider installing over a "laplink"
parallel port cable. The data rate over the parallel port is much
-higher than what is typically possible over a serial line with
-speeds of up to 50k/sec.
+higher than what is typically possible over a serial line, and speeds
+of up to 50KB/sec are not uncommon.
Finally, for the fastest possible network installation, an ethernet
adaptor is always a good choice! FreeBSD supports most common PC
-ethernet cards, a table of which is provided in the FreeBSD
-Hardware Guide (see the Documentation menu on the boot floppy).
-If you are using one of the supported PCMCIA ethernet cards, also be
-sure that it's plugged in _before_ the laptop is powered on! FreeBSD
-does not, unfortunately, currently support "hot insertion" of PCMCIA
-cards.
+ethernet cards, a table of which is provided in the FreeBSD Hardware
+Guide (see the Documentation menu on the boot floppy). If you are
+using one of the supported PCMCIA ethernet cards, also be sure that
+it's plugged in _before_ the laptop is powered on! FreeBSD does not,
+unfortunately, currently support "hot insertion" of PCMCIA cards.
-You will also need to know your IP address on the network, the "netmask"
-value for your address class, and the name of your machine.
+You will also need to know your IP address on the network, the
+"netmask" value for your address class, and the name of your machine.
Your system administrator can tell you which values to use for your
particular network setup. If you will be referring to other hosts by
name rather than IP address, you'll also need a name server and
possibly the address of a gateway (if you're using PPP, it's your
provider's IP address) to use in talking to it. If you do not know
-the answers to all or most of these questions, then you should
-really probably talk to your system administrator _first_ before
-trying this type of installation!
+the answers to all or most of these questions then you should really
+probably talk to your system administrator _first_ before trying this
+type of installation! Chosing the wrong IP address on a busy network
+will NOT make you popular with your systems administrator! :-)
diff --git a/usr.sbin/sysinstall/help/options.hlp b/usr.sbin/sysinstall/help/options.hlp
index c30180c..689c8cb 100644
--- a/usr.sbin/sysinstall/help/options.hlp
+++ b/usr.sbin/sysinstall/help/options.hlp
@@ -1,4 +1,5 @@
-The following options may be set from this screen:
+The following options may be set from this screen. Use the SPACE key
+to toggle an option's value, Q to leave when you're done.
NFS Secure: NFS server talks only on a secure port
@@ -14,82 +15,93 @@ NFS Slow: User is using a slow PC or ethernet card
the PC from becoming swamped with data.
-FTP Abort: On transfer failure, abort
+Debugging: Turn on the extra debugging flag
- This is pretty self-explanatory. If you're transfering from a
- host that drops the connection or cannot provide a file, abort
- the installation of that piece.
+ This turns on a lot of extra noise over on the second screen
+ (ALT-F2 to see it, ALT-F1 to switch back). If your installation
+ should fail for any reason, PLEASE turn this flag on when
+ attempting to reproduce the problem. It will provide a lot of
+ extra debugging at the failure point and may be very helpful to
+ the developers in tracking such problems down!
-FTP Reselect: On transfer failure, ask for another host
+Yes To All: Assume "Yes" answers to all non-critical dialogs
- This is more useful to someone doing an interactive installation.
- If the current host stops working, ask for a new ftp server to
- resume the installation from. The install will attempt to pick
- up from where it left off on the other server, if at all possible.
+ This flag should be used with caution. It will essentially
+ decide NOT to ask the user about any "boundry" conditions that
+ might not constitute actual errors but may be warnings indicative
+ of other problems. It's most useful to those who are doing unattended
+ installs.
-FTP Active: Use "active mode" for standard FTP
+FTP OnError: What to do when FTP transfer errors occur.
- For all FTP transfers, use "Active" mode. This will not work
- through firewalls, but will often work with older ftp servers
- that do not support passive mode. If your connection hangs
- with passive mode (the default), try active!
+ This is pretty self-explanatory. If you're transfering from a
+ host that drops the connection or cannot provide a file, you can
+ chose to Abort the connection, Retry the request (see next option)
+ or Reselect another FTP host, attempting to retry the request from
+ a new site. Pressing SPACE will toggle through these options.
-FTP Passive: Use "passive mode" for firewalled FTP
+FTP Retries: How many times to retry failing FTP requests.
- For all FTP transfers, use "Passive" mode. This allows the user
- to pass through firewalls that do not allow incoming connections
- on random port addresses.
+ If FTP OnError is set to `retry', this is the number of times to
+ loop on a failing request before giving up. If you're talking to a
+ site that's chronically overloaded (like ours!) you may wish to
+ simply set this to some large value and go to lunch or something.
- NOTE: ACTIVE AND PASSIVE MODES ARE NOT THE SAME AS A `PROXY'
- CONNECTION, WHERE A PROXY FTP SERVER IS LISTENING ON A DIFFERENT
- PORT!
- In such situations, you should specify the URL as something like:
+FTP username: Specify username and password instead of anonymous.
- ftp://foo.bar.com:1234/pub/FreeBSD
+ By default, the installation attempts to log in as the
+ anonymous user. If you wish to log in as someone else,
+ specify the username and password with this option.
- Where "1234" is the port number of the proxy ftp server.
+Tape Blocksize: Specify block size in 512 byte blocks of tape.
-Debugging: Turn on the extra debugging flag
+ This defaults to 20 blocks, which should work with most
+ tape drive + tar combinations. It may not allow your particular
+ drive to win any records for speed, however, and the more
+ adventurous among you might try experimenting with larger sizes.
- This turns on a lot of extra noise over on the second screen
- (ALT-F2 to see it, ALT-F1 to switch back). If your installation
- should fail for any reason, PLEASE turn this flag on when
- attempting to reproduce the problem. It will provide a lot of
- extra debugging at the failure point and may be very helpful to
- the developers in tracking such problems down!
+Extract Detail: How to show filenames on debug screen as they're extracted.
-Yes To All: Assume "Yes" answers to all non-critical dialogs
+ While a distribution is being extracted, the default detail level
+ of "high" will show the full file names as they're extracted.
+ If you would prefer a more terse form for this, namely dots, select
+ the "medium" detail level. If you want nothing to be printed
+ on the debugging screen during extraction, select "low".
- This flag should be used with caution. It will essentially
- decide NOT to ask the user about any "boundry" conditions that
- might not constitute actual errors but may be warnings indicative
- of other problems.
+Release Name: Which release to attempt to load from installation media.
-FTP userpass: Specify username and password instead of anonymous.
+ You should only change this option if you're really sure you know
+ what you are doing! This will change the release name used by
+ sysinstall when fetching components of any distributions.
- By default, the installation attempts to log in as the
- anonymous user. If you wish to log in as someone else,
- specify the username and password with this option.
+
+Browser Package: Which package to load for an HTML browser.
+
+ By default, this is set to lynx but may also be set to any other
+ text capable HTML browser for which a package exists. If you set this
+ to an X based browser, you will not be able to use it if you're running
+ in text mode! :)
+
+
+Browser Exec: Which binary to run for the HTML browser.
+
+ The full pathname to the main executable in Browser Package
-Clear: Clear All Option Flags
+Media Type: Which media type is being used.
- Reset all option flags back to their default values.
+ This is mostly informational and indicates which media type (if any)
+ was last selected in the Media menu. It's also a convenient short-cut
+ to the media menu itself.
-----
-Some of these items, like "FTP Active" or "FTP Passive", are actually
-mutually-exclusive even though you can turn all of them on or off at
-once. This is a limitation of the menuing system, and is compensated
-for by checks that ensure that the various flags are not in conflict.
-If you re-enter the Options menu again after leaving it, you'll see
-the settings it's actually using after checking for any possible
-conflicts.
+Use Defaults: Use default values.
+ Reset all options back to their default values.
diff --git a/usr.sbin/sysinstall/help/partition.hlp b/usr.sbin/sysinstall/help/partition.hlp
index 19b6ce1..cbce9a4 100644
--- a/usr.sbin/sysinstall/help/partition.hlp
+++ b/usr.sbin/sysinstall/help/partition.hlp
@@ -1,21 +1,50 @@
This is the FreeBSD DiskLabel Editor.
+NOTE: If you're entering this editor from the update procedure then
+you probably shouldn't (C)reate anything at all but rather use only
+the (M)ount command to check and mount existing partitions for
+upgrading.
+
+If you would like the label editor to do most of the following for
+you, simply type `A' for automatic partitioning of the disk.
+
+If you wish to create partitions manually you may do so by moving the
+highlighted selection bar with the arrow keys over the FreeBSD
+partition(s) displayed at the top of the screen. Typing (C)reate
+while a partition with available free space is selected will allow you
+to create a BSD partition inside of it using some or all of its
+available space.
+
+Typing (M)ount over an existing partition entry (displayed in the
+middle of the screen) will allow you to set a mount point for it
+without initializing it. If you want it initialized, use the (T)oggle
+command to flip the Newfs flag. When Newfs is set to "Y", the
+filesystem in question will be ERASED and rebuilt from scratch!
+
+NOTE: The (W)rite option is HIGHLY DANGEROUS and should NOT BE USED if
+you're installing a new system! It's only for use in resurrecting
+or changing an existing system, and will cause unpredictable things to
+happen if you use it in any other circumstances. Don't do it! Wait
+for the final commit dialog if you're express/novice installing, or
+use the "Commit" menu item if you're custom installing, and do it there.
+
+
You should use this editor to create at least the following
filesystems:
- Name Purpose Min Size? Optional?
- ---- ------- --------- ---------
- / Root filesystem 20MB No
- swap Swap space 2 * MEM No
- /usr System & user files 80MB or more Yes
+ Name Purpose Min Size? Optional?
+ ---- ------- --------- ---------
+ / Root filesystem 20MB No
+ swap Swap space 2 * MEM No
+ /usr System & user files 80MB or more Yes
Note: If you do not create a /usr filesystem then your / filesystem
will need to be bigger - at least 100MB. This is not recommended as
any media errors that may occur during disk I/O to user files will
corrupt the filesystem containing vital system files as well. It is
for this reason that / is generally kept on its own filesystem, where
-it's basically considered "read only" by the system and hence a good
-deal safer.
+it should be considered essentially "read only" in your administration
+of it.
Swap space is a little tricker, and the rule of "2 * MEM" is simply a
best-guess approximation and not necessarily accurate for your
@@ -44,79 +73,88 @@ instead. You may therefore wish to make the / partition bigger if you
expect a lot of mail or news and do not want to make /var its own
partition.
-
-If you're new to this installation, you should also first understand
-how FreeBSD 2.0.5's new "slices" paradigm for looking at disk storage
-works. It's not very hard to grasp. A "fully qualified slice name",
-that is the name of the file we open in /dev to talk to the slice, is
-optionally broken into 3 parts:
-
- First you have the disk name. Assume we have two SCSI
- drives in our system, which gives us `sd0' and `sd1'.
-
- Next you have the "Slice" (or "FDISK Partition") number,
- as seen in the Partition Editor. Assume that our sd0 contains
- two slices, a FreeBSD slice and a DOS slice. This gives us
- sd0s1 and sd0s2. Let's also say that sd1 is completely devoted
- to FreeBSD, so we have only one slice there: sd1s1.
-
- Next, if a slice is a FreeBSD slice, you have a number of
- (confusingly named) "partitions" you can put inside of it.
- These FreeBSD partitions are where various filesystems or swap
- areas live, and using our hypothetical two-SCSI-disk machine
- again, we might have something like the following layout on sd0:
-
- Name Mountpoint
- ---- ----------
- sd0s1a /
- sd0s1b <swap space>
- sd0s1e /usr
-
- Because of historical convention, there is also a short-cut,
- or "compatibility slice", that is maintained for easy access
- to the first FreeBSD slice on a disk for those programs which
- still don't know how to deal with the new slice scheme.
- The compatibility slice names for our filesystem above would
- look like:
-
- Name Mountpoint
- ---- ----------
- sd0a /
- sd0b <swap space>
- sd0e /usr
-
- FreeBSD automatically maps the compatibility slice to the first
- FreeBSD slice it finds (in this case, sd0s1). You may have multiple
- FreeBSD slices on a drive, but only the first one may be the
- compatibility slice!
-
- The compatibility slice will eventually be phased out, but
- it is still important right now for several reasons:
-
- 1. Some programs, as mentioned before, still don't work
- with the slice paradigm and need time to catch up.
-
- 2. The FreeBSD boot blocks are unable to look for
- a root file system in anything but a compatibility
- slice right now. This means that our root will always
- show up on "sd0a" in the above scenario, even though
- it really lives over on sd0s1a and would otherwise be
- referred to by its full slice name.
-
-Once you understand all this, then the label editor becomes fairly
-simple. You're either carving up the FreeBSD slices displayed at the
-top of the screen into smaller pieces (displayed in the middle of the
-screen) and then putting FreeBSD file systems on them, Or you're just
-mounting existing partitions/slices into your filesystem hierarchy;
-this editor lets you do both. Since a DOS partition is also just
-another slice as far as FreeBSD is concerned, you can mount one into
-in your filesystem hierarchy just as easily with this editor. For
-FreeBSD partitions you can also toggle the "newfs" state so that
-the partitions are either (re)created from scratch or simply checked
-and mounted (the contents are preserved).
+If you're new to this installation, you might also want to read the
+following explanation of how FreeBSD's new "slice" paradigm for
+looking at disk storage works:
+
+
+In FreeBSD's new system, a device name can be broken up into up to 3
+parts. Take a typical name like ``/dev/sd0s1a'':
+
+ The first three characters represent the drive name. If we had
+ a system with two SCSI drives on it then we'd see /dev/sd0 and
+ /dev/sd1 as the device entries representing the entire drives.
+
+ Next you have the "slice" (or "FDISK Partition") number,
+ as seen in the Partition Editor. Assuming that our sd0
+ contained two slices, a FreeBSD slice and a DOS slice, that
+ would give us /dev/sd0s1 and /dev/sd0s2 as device entries pointing
+ to the entire slices.
+
+ Next, if a slice is a FreeBSD slice, you can have a number of
+ (confusingly named) "partitions" inside of it.
+
+ These partitions are where various filesystems or swap areas live,
+ and using our hypothetical two-SCSI-disk machine again, we might
+ have something like the following layout on sd0:
+
+ Name Mountpoint
+ ---- ----------
+ sd0s1a /
+ sd0s1b <swap space>
+ sd0s1e /usr
+
+ Because of historical convention, there is also a short-cut,
+ or "compatibility slice", that is maintained for easy access
+ to the *first* FreeBSD slice on a disk. This gives some
+ backwards compatibility to utilities that still may not know
+ how to deal with the new slice scheme.
+
+ The compatibility slice names for our filesystem above would
+ also look like:
+
+ Name Mountpoint
+ ---- ----------
+ sd0a /
+ sd0b <swap space>
+ sd0e /usr
+
+ Again, let it be noted: FreeBSD automatically maps the
+ compatibility slice to the first FreeBSD slice it finds
+ (in this case, sd0s1). You may have multiple FreeBSD slices on a
+ drive, but only the first one will be mapped to the compatibility
+ slice!
+
+ The compatibility slice will eventually be phased out, but
+ it is still important right now for several reasons:
+
+ 1. Some programs, as mentioned before, still don't work
+ with the slice paradigm and need time to catch up.
+
+ 2. The FreeBSD boot blocks are unable to look for
+ a root file system in anything but a compatibility
+ slice right now. This means that our root will always
+ show up on "sd0a" in the above scenario, even though
+ it really lives over on sd0s1a and would otherwise be
+ referred to by its full slice name.
+
+Once you understand all this, then the purpose of the label editor
+becomes fairly clear: You're carving up the FreeBSD slices displayed
+at the top of the screen into smaller pieces, which are displayed in
+the middle of the screen, and then assigning FreeBSD file system names
+(mount points) to them.
+
+You can also use the label editor to mount existing partitions/slices
+into your filesystem hierarchy, as is frequently done for DOS FAT
+slices. For FreeBSD partitions, you can also toggle the "newfs" state
+so that the partitions are either (re)created from scratch or simply
+checked and mounted (the contents are preserved).
When you're done, type `Q' to exit.
No actual changes will be made to the disk until you (C)ommit from the
-Install menu! You're working with what is essentially a copy of
-the disk label(s), both here and in the FDISK Partition Editor.
+Install menu or (W)rite directly from this one. You're working with
+what is essentially a copy of the disk label(s), both here and in the
+FDISK Partition Editor, and the actual on-disk labels won't be
+affected by any changes you make until you explicitly say so.
+
diff --git a/usr.sbin/sysinstall/help/slice.hlp b/usr.sbin/sysinstall/help/slice.hlp
index e055ca4..1c1581b 100644
--- a/usr.sbin/sysinstall/help/slice.hlp
+++ b/usr.sbin/sysinstall/help/slice.hlp
@@ -1,15 +1,23 @@
-This is the Main Partition (or ``Slice'') Editor.
+This is the Main Partition (or ``FDISK'') Editor.
+
+Possible commands are printed at the bottom and the Master Boot Record
+contents are shown at the top. You can move up and down with the
+arrow keys and (C)reate a new partition whenever the highlighted
+selection bar is over a partition whose type is marked as "unused."
+
+You are expected to leave this screen with at least one partition
+marked "FreeBSD." Note that unlike Linux, you don't need to create
+multiple FreeBSD fdisk partition entries for different things like
+swap, file systems, etc. The usual convention is to create ONE
+FreeBSD partition per drive and then subsection this partition into
+swap and file systems with the Label editor.
-Possible commands are printed at the bottom, and the Master Boot Record
-contents are at the top. You can move up and down with the arrow keys
-and can (C)reate a new partition whenever the "bar" is over a partition
-whose type is set to "unused".
The flags field has the following legend:
- '=' -- Partition is properly aligned.
- '>' -- The partition doesn't end before cylinder 1024
- 'R' -- Has been marked as containing the root (/) filesystem
+ '=' -- This partition is properly aligned.
+ '>' -- This partition doesn't end before cylinder 1024
+ 'R' -- This partition contains the root (/) filesystem
'B' -- Partition employs BAD144 bad-spot handling
'C' -- This is the FreeBSD 2.0-compatibility partition (default)
'A' -- This partition is marked active.
@@ -21,8 +29,39 @@ If no partition is marked Active, you will need to either install
a Boot Manager (the option for which will be presented later in the
installation) or set one Active before leaving this screen.
-To leave this screen, type `Q'.
+To leave the partition editor, type `Q'.
No actual changes will be made to the disk until you (C)ommit from the
-Install menu! You're working with what is essentially a copy of
-the disk label(s), both here and in the Label Editor.
+Install menu or use the (W)rite option here! You're working with what
+is essentially a copy of the disk label(s), both here and in the Label
+Editor.
+
+NOTE: The (W)rite option is HIGHLY DANGEROUS and should NOT BE USED if
+you're installing a new system! It's only for use in resurrecting
+or changing an existing system, and will cause unpredictable things to
+happen if you use it in any other circumstances. Don't do it! Wait
+for the final commit dialog if you're express/novice installing, or
+use the "Commit" menu item if you're custom installing, and do it there.
+
+If you want to use the entire disk for FreeBSD, type `A'. You'll be
+asked whether or not you wish to keep the disk (potentially) compatible
+with other operating systems, i.e. the information in the FDISK table
+should be kept valid. If you select the default of `Yes', slices will be
+aligned to fictitious cylinder boundaries and space will be reserved
+in front of the FreeBSD slice for a [future] possible boot manager.
+
+For the truly dedicated disk case, you can select `No' at the
+compatibility prompt. In that case, all BIOS geometry considerations
+will no longer be in effect and you can safely ignore any
+``The detected geometry is invalid'' warning messages you may later
+see. It is also not necessary in this case to set a partition bootable
+or install an MBR boot manager as both things are then irrelevant.
+
+The FreeBSD slice will start at absolute sector 0 of the disk (so that
+FreeBSD's disk label is identical to the Master Boot Record) and
+extend to the very last sector of the disk medium. Needless to say,
+such a disk cannot have any sort of a boot manager, `disk manager',
+or anything else that has to interact with the BIOS. This option is
+therefore only considered safe for SCSI disks and most IDE disks and
+is primarily intented for people who are going to set up a dedicated
+FreeBSD server or workstation, not a typical `home PC'.
diff --git a/usr.sbin/sysinstall/help/usage.hlp b/usr.sbin/sysinstall/help/usage.hlp
index b01a94b..03a8159 100644
--- a/usr.sbin/sysinstall/help/usage.hlp
+++ b/usr.sbin/sysinstall/help/usage.hlp
@@ -1,6 +1,9 @@
HOW TO USE THIS SYSTEM
======================
+The following keys are recognised in most of the dialogs you'll
+encounter during this installation:
+
KEY ACTION
--- ------
UP ARROW Move to previous item (or up, in a text field).
@@ -12,18 +15,22 @@ LEFT ARROW Move to previous item or group (same as SHIFT-TAB).
RETURN Select item.
PAGE UP In text boxes, scrolls up one page.
PAGE DOWN In text boxes, scrolls down one page.
-SPACE In "radio" or multiple choice menus, toggle the current item.
+SPACE In "radio" or multiple choice menus, toggle the current
+ item. In help screens, scroll to next page of text.
F1 Help (in screens that provide it).
-If you also see small "^(-)" or "v(+)" symbols at the edges of a menu,
-it means that there are more items above or below the current one that
-aren't being shown (due to insufficient screen space). Using the
-up/down arrow keys will cause the menu to scroll. When a symbol
-disappears, it means you are at the top (or bottom) of the menu.
-
In text fields, the amount of text above the current point will be
displayed as a percentage in the lower right corner. 100% means
-you're at the bottom of the field.
+you're at the bottom of the available text.
+
+If you see small "^(-)" or "v(+)" symbols at the edges of a menu, it
+means that there are more items above or below the current one that
+aren't being shown (due to insufficient screen space). Using the
+up/down arrow keys will cause the menu to scroll. The PageUp and
+PageDown keys will scroll by entire screens.
+
+When an arrow symbol disappears, it means you are at the top (or
+bottom) of the menu.
Selecting OK in a menu will confirm whatever action it's controlling.
Selecting Cancel will cancel the operation and generally return you to
@@ -35,20 +42,25 @@ SPECIAL FEATURES:
It is also possible to select a menu item by typing the first
character of its name, if unique. Such "accelerator" characters will
-be specially highlighted in the item name.
+be specially highlighted in the item name. Unfortunately, the
+accellerators aren't always unique (a shortcoming of the dialog menu
+library) so you'll only be able to get at the *first* unique menu
+entry for a given accellerator.
The console driver also contains a scroll-back buffer for reviewing
things that may have scrolled off the screen. To use scroll-back,
-press the "Scroll Lock" key on your keyboard and use the arrow or
-Page Up/Page Down keys to move through the saved text. To leave
-scroll-back mode, press the Scroll Lock key again. This feature
-is most useful for dealing with sub-shells or other "wizard modes"
-that don't use menus.
-
-Once the system is fully installed and running "multi-user", you will
-also find that you have multiple "virtual consoles" and can use them to
-have several active sessions at once. Use ALT-F<n> to switch between
-them, where `F<n>' is the function key corresponding to the screen you
-wish to see. By default, the system comes with 3 virtual consoles enabled.
-You can create more by editing the /etc/ttys file, once the system is up,
-for a maximum of 12.
+press the "Scroll Lock" key on your keyboard and use the arrow or Page
+Up/Page Down keys to move through the saved text. To leave
+scroll-back mode, press the Scroll Lock key again. This feature is
+most useful for reading back through your boot messages (go ahead, try
+it now!) though it's also useful when dealing with sub-shells or other
+"wizard modes" that don't use menus and tend to scroll their output
+off the top of the screen.
+
+Once the system is fully installed and running multi-user you will
+also find that you have multiple "virtual consoles" and can use them
+to have several active sessions at once. Use ALT-F<n> to switch
+between them, where `F<n>' is the function key corresponding to the
+screen you wish to see. By default, the system comes with 3 virtual
+consoles enabled. You can create more by editing the /etc/ttys file
+(up to a maximum of 12).
OpenPOWER on IntegriCloud