diff options
author | philip <philip@FreeBSD.org> | 2007-06-25 16:37:17 +0000 |
---|---|---|
committer | philip <philip@FreeBSD.org> | 2007-06-25 16:37:17 +0000 |
commit | 9caeeb576e4bf721172da5eb523aa288d5bae3e5 (patch) | |
tree | 44bec475d5d95cd84a7407293d078dfef6ce5d71 | |
parent | 038c1f6362a2d26ae876ba58fb4c9c3e25c355c3 (diff) | |
download | FreeBSD-src-9caeeb576e4bf721172da5eb523aa288d5bae3e5.zip FreeBSD-src-9caeeb576e4bf721172da5eb523aa288d5bae3e5.tar.gz |
Fix a number of documentation-lags-behind-reality bugs in sysinstall(8).
While here, fix a couple of comments too.
Submitted by: Oliver Fromme <olli -at- lurza.secnetix.de>
Approved by: re (kensmith)
-rw-r--r-- | usr.sbin/sysinstall/dist.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/help/distributions.hlp | 8 | ||||
-rw-r--r-- | usr.sbin/sysinstall/help/fixit.hlp | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/help/media.hlp | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/help/network_device.hlp | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/help/options.hlp | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/help/securelevel.hlp | 12 | ||||
-rw-r--r-- | usr.sbin/sysinstall/help/shortcuts.hlp | 38 | ||||
-rw-r--r-- | usr.sbin/sysinstall/install.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.8 | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/system.c | 2 |
12 files changed, 49 insertions, 41 deletions
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 094ede2..01308b0 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -326,8 +326,8 @@ distMaybeSetPorts(dialogMenuItem *self) { dialog_clear_norefresh(); if (!msgYesNo("Would you like to install the FreeBSD ports collection?\n\n" - "This will give you ready access to over 14,900 ported software packages,\n" - "at a cost of around 440MB of disk space when \"clean\" and possibly\n" + "This will give you ready access to over 17,000 ported software packages,\n" + "at a cost of around 400MB of disk space when \"clean\" and possibly\n" "much more than that when a lot of the distribution tarballs are loaded\n" "(unless you have the extra discs available from a FreeBSD CD/DVD distribution\n" "and can mount them on /cdrom, in which case this is far less of a problem).\n\n" diff --git a/usr.sbin/sysinstall/help/distributions.hlp b/usr.sbin/sysinstall/help/distributions.hlp index f78262a..d6fefa6 100644 --- a/usr.sbin/sysinstall/help/distributions.hlp +++ b/usr.sbin/sysinstall/help/distributions.hlp @@ -15,16 +15,16 @@ The current "canned" installations are provided: All: The base distribution, man pages, dictionary files, profiling libraries, the FreeBSD compatibility libraries, - the complete source tree, games and your choice of XFree86 + the complete source tree, games and your choice of Xorg distribution components. -Developer: Base ("bin") distribution, man pages, dictionary - files, profiling libraries and the complete source tree. +Developer: Base distribution, man pages, dictionary files, + profiling libraries and the complete source tree. Kern-Developer: As Developer, but with only kernel sources instead of the complete source tree. -User: The base distribution, man pages, and dictionary files. +User: The base distribution, man pages and dictionary files. Minimal: Only the base distribution. diff --git a/usr.sbin/sysinstall/help/fixit.hlp b/usr.sbin/sysinstall/help/fixit.hlp index 5f37da1..801f258 100644 --- a/usr.sbin/sysinstall/help/fixit.hlp +++ b/usr.sbin/sysinstall/help/fixit.hlp @@ -1,3 +1,3 @@ A special shell will be launched by this option with a fixit floppy -(or 2nd CDROM) mounted as /mnt2. This provides access to extra -commands under /mnt2. +or a FreeBSD CD-ROM (or DVD-ROM) mounted as /mnt2. This provides +access to extra commands under /mnt2. diff --git a/usr.sbin/sysinstall/help/media.hlp b/usr.sbin/sysinstall/help/media.hlp index 57ab36f..414a2aa 100644 --- a/usr.sbin/sysinstall/help/media.hlp +++ b/usr.sbin/sysinstall/help/media.hlp @@ -1,8 +1,8 @@ You can install from the following types of media: CDROM requires one of the following supported CDROM drives: - ATAPI - Any standard ATAPI CDROM driver hooked to - a supported controller <see Hardware Guide). + ATAPI - Any standard ATAPI CDROM drive hooked to + a supported controller (see Hardware Guide). SCSI - Any standard SCSI CDROM drive hooked to a supported controller (see Hardware Guide). diff --git a/usr.sbin/sysinstall/help/network_device.hlp b/usr.sbin/sysinstall/help/network_device.hlp index a65467b..affa86a 100644 --- a/usr.sbin/sysinstall/help/network_device.hlp +++ b/usr.sbin/sysinstall/help/network_device.hlp @@ -40,9 +40,9 @@ of over 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 +Guide (see the `Documentation' entry in the main menu). 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, +it's plugged in BEFORE the laptop is powered on! Sysinstall does not, unfortunately, currently support "hot insertion" of PCMCIA cards. You will also need to know your IP address on the network, the diff --git a/usr.sbin/sysinstall/help/options.hlp b/usr.sbin/sysinstall/help/options.hlp index 0896845..f115577 100644 --- a/usr.sbin/sysinstall/help/options.hlp +++ b/usr.sbin/sysinstall/help/options.hlp @@ -85,7 +85,7 @@ Editor: Specify which screen editor to use. thrown unceremoniously into a screen editor. A relatively simplistic editor which shows its command set on-screen is selected by default, but UNIX purists may wish to change this - setting to /usr/bin/vi + setting to `/usr/bin/vi'. Tape Blocksize: Specify block size in 512 byte blocks of tape. @@ -123,7 +123,7 @@ Install Root: Specify some directory other than / as your "root". for some reason. Note: If you set this option, you will only be able to install - packages if the bin distribution is also installed (usually + packages if the base distribution is also installed (usually the case anyway) since /usr/sbin/pkg_add will otherwise not be found after the chroot() call. diff --git a/usr.sbin/sysinstall/help/securelevel.hlp b/usr.sbin/sysinstall/help/securelevel.hlp index 06910d5..27eb1ec 100644 --- a/usr.sbin/sysinstall/help/securelevel.hlp +++ b/usr.sbin/sysinstall/help/securelevel.hlp @@ -3,7 +3,7 @@ This menu allows you to configure the Securelevel mechanism in FreeBSD. Securelevels may be used to limit the privileges assigned to the root user in multi-user mode, which in turn may limit the effects of a root compromise, at the cost of reducing administrative functions. -Refer to the security(7) manual page for complete details. +Refer to the security(7) and init(8) manual pages for complete details. -1 Permanently insecure mode - always run the system in level 0 mode. This is the default initial value. @@ -14,8 +14,9 @@ Refer to the security(7) manual page for complete details. 1 Secure mode - the system immutable and system append-only flags may not be turned off; disks for mounted file systems, - /dev/mem, and /dev/kmem may not be opened for writing; kernel - modules (see kld(4)) may not be loaded or unloaded. + /dev/mem, /dev/kmem and /dev/io (if your platform has it) + may not be opened for writing; kernel modules (see kld(4)) + may not be loaded or unloaded. 2 Highly secure mode - same as secure mode, plus disks may not be opened for writing (except by mount(2)) whether mounted or @@ -29,8 +30,9 @@ Refer to the security(7) manual page for complete details. second''. 3 Network secure mode - same as highly secure mode, plus IP - packet filter rules (see ipfw(8) and ipfirewall(4)) cannot be - changed and dummynet(4) configuration cannot be adjusted. + packet filter rules (see ipfw(8), ipfirewall(4) and pfctl(8)) + cannot be changed and dummynet(4) or pf(4) configuration + cannot be adjusted. Securelevels must be used in combination with careful system design and application of protective mechanisms to prevent system configuration diff --git a/usr.sbin/sysinstall/help/shortcuts.hlp b/usr.sbin/sysinstall/help/shortcuts.hlp index 0054394..553e96f 100644 --- a/usr.sbin/sysinstall/help/shortcuts.hlp +++ b/usr.sbin/sysinstall/help/shortcuts.hlp @@ -15,26 +15,26 @@ browserBinary Which doc browser to use (default: links) browserPackage Which package to get browser from (default: links) cpioVerbose How verbose to be with cpio: high, medium or low debug Extra debugging? +defaultrouter IP address of default route disk Which disk to operate on (ad0, da0, etc). domainname Domain name editor Which screen editor to use -ifconfig_<iface> For each <iface> in network_devices +ftp Which FTP site/dir to use (URL ftp://site/dir/..) ftpDirectory Root of the FreeBSD distribution tree on FTP server +ftpHost Which FTP hostname to use (overrides ftp variable) ftpOnError Set to retry or abort ftpPass Which password to use when logging into FTP server -ftp Which FTP site/dir to use (URL ftp://site/dir/..) ftpPort Which FTP port to use (default: 21) ftpRetryCount How many times to retry a fetch operation ftpUser Which username to use when logging into FTP server -ftpHost Which FTP hostname to use (overrides ftp variable) gated Use gated instead of routed -defaultrouter IP address of default route geometry Geometry to use for selected disk ("cyl/hd/sec") hostname Fully qualified domain name for host. -network_interfaces Which network interfaces to configure +ifconfig_<iface> For each <iface> in network_devices ipaddr IP address for this host's primary interface nameserver IP address of name server netmask Netmask for this host's primary interface +network_interfaces Which network interfaces to configure nfs Full host:/path/ specification to NFS media nfsHost Host portion of nfs path nfsSecure Use NFS secure mount (-P flag) @@ -56,8 +56,8 @@ varSize Size of the /var partition to create for Auto And "command" can be one or more of: -addUser Add a new user to the system addGroup Add a new group to the system +addUser Add a new user to the system configAnonFTP Configure system for anonymous FTP configInetd Configure the inetd super-server configNFSServer Configure host as an NFS server @@ -65,38 +65,38 @@ configNTP Configure host as an NTP client configPackages Browse / install packages configRouter Configure a routing daemon configUsers Add users and/or groups to the system +diskLabelCommit Write out any changed label information +diskLabelEditor Label/Newfs/Mount new or existing filesystems diskPartitionEditor Partition a new or existing disk diskPartitionWrite Write out any changed partition information -diskLabelEditor Label/Newfs/Mount new or existing filesystems -diskLabelCommit Write out any changed label information +distExtractAll Extract all selected distributions distReset Reset distribution information distSetDeveloper Select developer distribution -distSetXDeveloper Select X developer distribution +distSetEverything Select all distributions distSetKernDeveloper Select kernel developer distribution -distSetUser Select user distribution -distSetXUser Select X user distribution distSetMinimum Select minimal distribution -distSetEverything Select all distributions -distSetDES Select DES sub-distributions distSetSrc Select source sub-distributions -distSetXF86 Select XFree86 sub-distributions -distExtractAll Extract all selected distributions +distSetUser Select user distribution +distSetXDeveloper Select Xorg developer distribution +distSetXOrg Select Xorg sub-distributions +distSetXUser Select Xorg user distribution docBrowser Browse documentation installCommit Commit any pending installation operations installExpress Express installation installStandard Standard installation installUpgrade Upgrade installation +mediaGetType Prompt for media type mediaSetCDROM Select CDROM media -mediaSetFloppy Select floppy media +mediaSetCPIOVerbosity Prompt for CPIO verbosity mediaSetDOS Select DOS media mediaSetFTP Select FTP media mediaSetFTPPassive Select FTP media in passive mode +mediaSetFTPUserPass Prompt for FTP username and password +mediaSetFloppy Select floppy media +mediaSetHTTP Select FTP media via HTTP proxy mediaSetNFS Select NFS media mediaSetTape Select tape media mediaSetUFS Select UFS media -mediaSetFTPUserPass Prompt for FTP username and password -mediaSetCPIOVerbosity Prompt for CPIO verbosity -mediaGetType Prompt for media type optionsEditor Go to options editor tcpMenuSelect Configure TCP/IP networking diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 9aff853..cd44a7e 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -322,8 +322,8 @@ installFixitHoloShell(dialogMenuItem *self) { FixItMode = 1; systemCreateHoloshell(); - return DITEM_SUCCESS; FixItMode = 0; + return DITEM_SUCCESS; } int diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8 index 833d6cd..cb1de79 100644 --- a/usr.sbin/sysinstall/sysinstall.8 +++ b/usr.sbin/sysinstall/sysinstall.8 @@ -434,6 +434,8 @@ The ports collection. /usr/src/[top level files] .It Li scontrib /usr/src/contrib +.It Li scrypto +/usr/src/crypto .It Li sgnu /usr/src/gnu .It Li setc @@ -462,6 +464,8 @@ The ports collection. /usr/src/share .It Li ssys /usr/src/sys +.It Li stools +/usr/src/tools .It Li subin /usr/src/usr.bin .It Li susbin @@ -498,6 +502,8 @@ X.Org Type 1 font set. X.Org TrueType font set. .It Li Xfs X.Org font server. +.It Li local +Local additions collection. .El .El .It distSetDeveloper diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 9ac1214..0263bf6 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -484,7 +484,7 @@ extern DMenu MenuHTMLDoc; /* HTML Documentation menu */ extern DMenu MenuUsermgmt; /* User management menu */ extern DMenu MenuFixit; /* Fixit floppy/CDROM/shell menu */ extern DMenu MenuXOrgConfig; /* Select X.Org configuration tool */ -extern int FixItMode; /* FixItMode starts shell onc urrent device (ie Serial port) */ +extern int FixItMode; /* FixItMode starts shell on current device (ie Serial port) */ extern const char * StartName; /* Which name we were started as */ extern int NCpus; /* # cpus on machine */ diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index 5622f25..b7fae6a 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -535,7 +535,7 @@ systemCreateHoloshell(void) else { (void)waitpid(ehs_pid, &waitstatus, 0); /* we only wait for shell to finish - it serial mode + in serial mode since there is no virtual console */ systemResumeDialog(); |