Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Add a new gptboot(8) man page. Factor out the redundant information
in gpart(8) and boot(8), adding references to gptboot(8) in both.

Reviewed by: jhb, ae, pjd, Paul Schenkeveld <bsdcan@psconsult.nl>, david_a_bright@dell.com (portions), gjb
MFC after: 1 week

Clarify that overriding the -h/-D flags through flags in device.hints
only works for sio(4) but not for uart(4) which no longer has this flag.

Add BSD copyright notice.

Approved by: gordon@

Add -e to set arbitrary kernel environment variables.

Nextboot(8) can now set any combination of kernel name (-k), kernel
options (-o), and environment strings (-e). As a result of this change
-k also becomes optional.

Reviewed by: freebsd-current (Ian Lepore, pluknet@, jhb@)

Spelling fixes for sbin/

Let reboot(8) use getprogname() to compare the program name.

While there, mark the global variable dohalt static, as reboot(8) only
consists of a single C file.

Remove vestiges of disklabel(5).

Reviewed by: uqs
MFC after: 5 days

Remove stale reference to wtmp(5).

Reported by: pluknet

nextboot: warn about limitations of /boot/nextboot.conf on ZFS

MFC after: 1 week

Let boot(8) refer to the uart(4) serial driver, which is the replacement
for the obsolete sio(4) driver.

PR: docs/144498
Submitted by: Bruce Cran (bruce at cran dot org dot uk)
Approved by: marcel
MFC after: 2 weeks

Remove stale references to utmp(5) and its corresponding filenames.

I removed utmp and its manpage, but not other manpages referring to it.

Port the remaining apps in sbin/ to utmpx; only reboot(8).

Add forgotten `void' keyword. This function has no arguments.

Let init(8) and reboot(8) use utmpx to log wtmp entries.

logwtmp() gets called with the raw strings that are written to disk. For
regular user entries, this isn't too bad, but when booting/shutting
down, the contents get rather cryptic.

Just call the standardized pututxline().

More rational usage()

Switch the default WARNS level for sbin/ to 6.

Submitted by: Ulrich Spörlein

Remove and unused variable.

Submitted by: Christoph Mallon christoph.mallon@gmx.de
MFC after: 2 weeks

- Sweep the boot(8) man page after addition of boot.config(5).

Reviewed by: keramida
Approved by: re (kensmith)

Cross-reference nextboot(8).

MFC after: 3 days

Block a variety of signals which may afffect reboot(8), before killing
init(8), to avoid losing a race to them and dying before being able
to call reboot(2).

PR: bin/64664
Submitted by: maxim
Obtained from: NetBSD
MFC after: 30 days

Block SIGHUP before killing init(8), to avoid a race condition which may
kill the current process and hang the system when attempting reboot.

PR: bin/64664
Reviewed by: ssouhal, phk (historic)
MFC after: 30 days

o Describe what actually boot(8) -m mutes.

PR: docs/67893
Submitted by: Chris Pepper, Daniel Gerzo
MFC after: 2 weeks

Revert previous change, "getopts" (with an 's') is a builtin in
/bin/sh.

Remove dependency on getopts because it is on /usr and we want to
use 'nextboot -D' in rc. Option parsing cribbed from vgrind.sh.

-mdoc sweep.

Do not install boot_i386.8 on all architectures.

Add new option `q', which makes second stage loader quiet unless autoboot
is disabled or fails.

MFC after: 1 week

Replace "/etc/make.conf" with references to make.conf(5)
where applicable. The main reason for this change is that
the location of make.conf is not constant and can be
modified via __MAKE_CONF. This change also improves
hyper-text linkage in our manpages.

MFC after: 2 weeks

Simplified markup.

Add the ability to specify the boot2 serial console speed in
/boot.config or on the "boot:" prompt line via a "-S<speed>" flag,
e.g. "-h -S19200". This adds about 50 bytes to the size of boot2
and required a few other small changes to limit the size impact.
This changes only affects boot2; there are further loader changes
to follow.

Spell "partition" correctly.

PR: docs/84198
Submitted by: Gary W. Swearingen
MFC after: 3 days

Truncate nextboot.conf file on creation, so existing garbage will be removed.

Submitted by: Gary Allan <dragonfly@gallan.plus.com>
Obtained from: DragonFlyBSD
MFC after: 3 days

Sync program's usage() with manpage's SYNOPSIS.

Code style tweaks: Use static and const where suitable.

The kernel specified in main() of reboot(8) will be initialized
with -k option and never be used without kflag. This confuses
gcc because we set "kflag" at the same time with "kernel", but
the logic is not that apparant for gcc.

Since we can initialize "kernel" to NULL then know if "k" option
is set through determining whether it is still NULL, don't try
to have gcc to guess why we are connecting "kflag" with "kernel"
and use "kernel" directly in place of kflag.

Bump WARNS?= from 2 to 6

Sort sections.

Scheduled mdoc(7) sweep.

Fixed desctiptions of some options:

- Document better what the -C option means.
- The -c option is currently a no-op.
- The -D and -h options do not allow switching between
single/dual console modes and internal/video consoles.
(This used to be true for the old biosdisk boot code,
but now they just force the multiple consoles mode and
serial console, respectively.)

FreeBSD has full support for multiple consoles since 2001.

Sort the SEE ALSO list correctly. Update the document date.

Reported by: ru

Refrence bsdlabel.8 and bsdlabel.5 rather then the obsolete disklabel.8
and disklabel.5. Refrencing bsdlabel.5 is somewhat bogus as it is not
connected to the build and is mostly unwritten at this point.

Reported by: Matthias Andree <matthias.andree at web.de>
PR: docs/72020

Clarify boot.8 (i386 version) a bit, so that people know
where boot.config needs to reside. Also change /kernel
to /boot/loader, as that is the apparent default now. This
man page probably requires more updates.

Mechanically kill hard sentence breaks.

Remove advertising clause from University of California Regent's license,
per letter dated July 22, 1999.

Approved by: core, imp

Share the i386 boot manual page.

Use __FBSDID() to quiet GCC 3.3 warnings.

When kill(-1) returns ESRCH, it could be because the current process
doesn't have a process group, which can occur if you're working with
a custom init that doesn't set up a full tty context. Rather than
refusing to reboot, ignore ESRCH from the kill attempt in reboot(8).

Add the /boot prefix. I forgot this when updating the location.

Neglected by: trhodes

Update the kernel location in FILES.

PR: 47015

english(4) police.

Uniformly refer to a file system as "file system".

Approved by: re

mdoc(7) police: overhaul.

mdoc(7) police: Nits.

Approved by: re

Fix one misspelling and two punctuation nits.

Hook the new nextboot(8) manpage up to the build.

Add a nextboot manual page.

Spotted by: brandt@fokus.gmd.de

Document behaviour change in reboot(8) introduced in reboot.c rev. 1.17:
when using '-p' with reboot, and the power down action failds, reboot
the system normally. The behaviour of 'halt -p' and of shutdown(8) is
unchanged.

Approved by: roberto

Set only the RB_POWEROFF flag (not the RB_HALT flag) when
'-p' is used on the reboot(8) command line.

This is intended for use when you want to attempt a power down
action, but you want the system to reboot (not halt) if the
power down action fails.

This is typically useful when the power-off action performed by
the kernel consists in signalling an uninterrupted power supply
that it should shut down its inverter if mains power has not returned.

The behaviour of shutdown(8) and init(8) is not modified;
only the behaviour of invoking 'reboot -p' manually is
modified, and then only in the case when a power-down action
fails.

Sounded reasonable to: phk
Approved by: roberto (mentor)

s/filesystem/file system/g as discussed on -developers

The .Nm utility.

mdoc(7) police: nits.

Correct the file that reboot -k creates so that it works with the new
nextboot functionality.

Reviewed by: jake (mentor)

Add a nextboot script to make it easier to control the loader nextboot
support. Also, hook it up to the build.

Approved by: jake (mentor)

more file system > filesystem

Rename the file used to specify the nextboot to make it clear that this
is a loader configuration file and can be used for more than just a
kernel name.

Submitted by: Gordon Tetlow <gordont@gnf.org>

Add a -k option to reboot to specify the kernel to boot next time
around. If the kernel boots successfully, the record of this kernel
is erased, it is intended to be a one-shot option for testing
kernels.

This could be improved by having the loader remove the record of
the next kernel to boot, it is currently removed in /etc/rc immediately
after disks are mounted r/w.

I'd like to MFC this before the 4.6 freeze unless there is violent
objection.

Reviewed by: Several on IRC
MFC after: 4 days

Add forgotten flag in flag lists.

PR: docs/36267 (partial)
Submitted by: Thomas Quinot <thomas.cuivre.fr.eu.org>

Add option -n to i386 boot2 to disallow boot interruption by keypress.

PR: i386/36016
Submitted by: Thomas Quinot <thomas@cuivre.fr.eu.org>
Reviewed by: rnordier
MFC after: 1 week

Clarify the cylinder > 1023 issue, now that EDD support is automatic.
Also drop a note about undocumented features that was intended to
cover the since-documented slice-selection syntax.

Document the "slice" syntax.

Prodded by: ambrisko

Implement -m and -p loader(8) "boot" command options in boot2.
(This is more useful for 4.x where boot blocks can still load
kernels, modulo the PR kern/17422.)

mdoc(7) police: add -p to the synopsis line as well.

Add new boot flag to i386 boot: -p.
This flag adds a pausing utility. When ran with -p, during the kernel
probing phase, the kernel will pause after each line of output.
This pausing can be ended with the '.' key, and is automatically
suspended when entering ddb.

This flag comes in handy at systems without a serial port that either hang
during booting or reser.
Reviewed by: (partly by jlemon)
MFC after: 1 week

Default to WARNS=2.
Binary builds that cannot handle this must explicitly set WARNS=0.

Reviewed by: mike

Use ${MACHINE}, it works with cross-builds.

mdoc(7) police: s/BSD/.Bx/ where appropriate.

mdoc(7) police:

Avoid using parenthesis enclosure macros (.Pq and .Po/.Pc) with plain text.
Not only this slows down the mdoc(7) processing significantly, but it also
has an undesired (in this case) effect of disabling hyphenation within the
entire enclosed block.

Remove whitespace at EOL.

Constify and set WARNS=2.

Submitted by: Mike Barcroft <mike@q9media.com>

Include missing header files which define functions for which gcc has
builtins (e.g., exit, strcmp).

Remove duplicate words.

Remove the "undocumented" comment in re lflag.

Document the -l option.

PR: docs/27440
Submitted by: Flix-Antoine Paradis <reel@sympatico.ca>

mdoc(7) police: normalize .Nd.

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

Reboot(8) normally waits 5 seconds after sending SIGTERMs to all
processes and then sends SIGKILLs. If a lot of processes are swapped
out, this delay may not be long enough, so processes such as an X
server may be killed before they have had time to clean up properly.

Make this delay more dynamic by waiting up to 60 seconds for swap
page-in activity to end. While I'm here, ANSIfy and remove a
`register' specifier.

mdoc(7) police: split punctuation characters + misc fixes.

Prepare for mdoc(7)NG.

mdoc(7) police: use the new features of the Nm macro.

.Xr boot0cfg 8 ,

PR: misc/18267 (Usov Alexander <[3]usov@ups.kiev.ua>)

The new boot code uses `ad' for ATA disks, not `wd'. Correct the
manual page.

Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.

Add `.Nm fastboot' and `.Nm fasthalt' to NAME section.

Add a "-d" option which causes the system to generate a crash dump.

Sync with reallity (USERCONFIG_BOOT option was removed long time ago)
mdoc(7)'fy

$Id$ -> $FreeBSD$

Remove reference to the obsoleted COMCONSOLE option.

Pointed out by: Crist J. Clark <cjc@cc942873-a.ewndsr1.nj.home.com>

Document -P (keyboard probe) assumptions.

Clarify some details.

Include a table of disk error codes and a note about the cylinder >
1023 issue.

Add cross-reference to loader man page, plus various minor
improvements.

Make some further revisions to the boot documentation.

Make a start on revising the boot documentation.

Remove the reference to the -b option; it's gone.

Correct use of .Nm. Add rcsid. -Wall. Add -p flag in usage string (was missing).

The '-h' option cannot toggle the kernel from a serial console
if the kernel was built with COMCONSOLE

PR: 7202
Reviewed by: phk
Submitted by: Greg A. Woods <woods@zeus.leitch.com>

say a few words about the -b option.

Reviewed by: Bill Trost <trost@cloud.rain.com>

PR: 6104
Submitted by: Anatoly Vorobey <mellon@pobox.com>
Fix typo

Document the enhanced behaviour of the '-c' flag.

Document recent changes (config files and -D...) and not so recent changes
(bios drive number...).

Submitted by: mostly by yokota

Remove lines inside #ifdef 0/#endif.

Use err(3) instead of local copy.

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Sort cross references.

Add support to halt, to allow it to request that the power be turned off
(the RB_POWEROFF flag)

Removed the boot_*(8) man pages for machines we don't support:
hp300, sparc, tahoe, and vax

Correct a bunch of man page cross references and generally
try and silence "manck".

ncurses, rpc, and some of the gnu stuff are still a big mess, however.

Fix a bunch of spelling errors.

Totally revamp the man page, update to the state of affairs.

Make a link from boot_${ARCH}.8 to boot.8, so people will get what
they expect when asking "man boot".

I think David will lynch me when i'm requesting this to go into 2.1... :-)

Install aliases "fasthalt" and "fastboot" for halt and boot respectively.
This is for "backwards compatibility". Documented these aliases in the
manual page.

Converted 'vmunix' to 'kernel'.

Convert to our man installation style. Also fixed long-standing bug
in `fastboot'/`fasthalt' in which the interpreter would hang around
after `reboot' or `halt' is run, causing an irritating ``Killed'' message.

Disable afterinstall: for manual pages until the manual page fix patch
comes in.

This commit was generated by cvs2svn to compensate for changes in r1558,
which included commits to RCS files with non-trunk default branches.