From 9448def93e6003146d288bf24798f5537e5c73c0 Mon Sep 17 00:00:00 2001 From: Philippe Charnier Date: Wed, 15 Jul 1998 06:51:38 +0000 Subject: [PATCH] Correct use of .Nm. Add rcsid. -Wall. Add -p flag in usage string (was missing). --- sbin/reboot/boot_i386.8 | 8 ++++---- sbin/reboot/reboot.8 | 27 ++++++++++----------------- sbin/reboot/reboot.c | 25 ++++++++++++++----------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8 index 516d4f9bc54e..cdbedc337165 100644 --- a/sbin/reboot/boot_i386.8 +++ b/sbin/reboot/boot_i386.8 @@ -36,7 +36,7 @@ .\" .\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94 .\" -.\" $Id: boot_i386.8,v 1.11 1998/04/26 18:15:38 phk Exp $ +.\" $Id: boot_i386.8,v 1.12 1998/07/09 06:24:21 phk Exp $ .\" .Dd April 19, 1994 .Dt BOOT 8 i386 @@ -112,7 +112,7 @@ The unit number of the drive on the interface being used. 0 for the first drive, 1 for the second drive, etc. .It part The partition letter inside the BSD portion of the disk. See -.Xr disklabel 8 . +.Xr disklabel 8 . By convention, only partition .Ql a contains a bootable image. If sliced disks are used @@ -131,7 +131,7 @@ Boot flags: during kernel initialization, ask for the device to mount as as the root file system. .It Fl b -puts the screen in 800x600x4 mode (Vesa mode 0x102). +put the screen in 800x600x4 mode (Vesa mode 0x102). This is useful on laptops whose graphics chips are not supported by XFree86 by the XF86_VGA16 server. You need to have a 8x16 font compiled into syscons or loaded as @@ -192,7 +192,7 @@ that the kernel was loaded from. boot into single-user mode; if the console is marked as .Dq insecure .Pq see Xr ttys 5 , -the root password must be entered +the root password must be entered. .It Fl v be verbose during device probing (and later). .El diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8 index 6252093b0588..c43c5f172a66 100644 --- a/sbin/reboot/reboot.8 +++ b/sbin/reboot/reboot.8 @@ -30,6 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)reboot.8 8.1 (Berkeley) 6/9/93 +.\" $Id$ .\" .Dd June 9, 1993 .Dt REBOOT 8 @@ -52,7 +53,7 @@ stopping and restarting the system The .Nm halt and -.Nm reboot +.Nm utilities flush the file system cache to disk, send all running processes a SIGTERM (and subsequently a SIGKILL) and, respectively, halt or restart the system. @@ -60,28 +61,20 @@ The action is logged, including entering a shutdown record into the login accounting file. .Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl n -If the -.Fl n -option is specified, -the file system cache is not flushed. +The file system cache is not flushed. This option should probably not be used. .It Fl q -If the -.Fl q -option is specified, -the system is halted or restarted quickly and ungracefully, and only +The system is halted or restarted quickly and ungracefully, and only the flushing of the file system cache is performed. This option should probably not be used. .It Fl p -If the -.Fl p -option is specified, then the system will turn off the power +The system will turn off the power if it can. This is of course likely to make -.Nm reboot +.Nm rather similar to -.Nm halt. +.Nm halt . .El .Pp The @@ -91,7 +84,7 @@ and utilities are nothing more than aliases for the .Nm halt and -.Nm reboot +.Nm utilities. .Pp Normally, the @@ -105,6 +98,6 @@ users advance warning of their impending doom. .Xr sync 8 .Sh HISTORY A -.Nm reboot +.Nm command appeared in .At v6 . diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 6fb6a012d3c6..ca3e729feaac 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -29,30 +29,33 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: reboot.c,v 1.5 1997/06/16 06:43:13 charnier Exp $ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1980, 1986, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint +#if 0 static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93"; +#endif +static const char rcsid[] = + "$Id$"; #endif /* not lint */ #include +#include #include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include void usage __P((void)); @@ -178,6 +181,6 @@ main(argc, argv) void usage() { - (void)fprintf(stderr, "usage: %s [-nq]\n", dohalt ? "halt" : "reboot"); + (void)fprintf(stderr, "usage: %s [-npq]\n", dohalt ? "halt" : "reboot"); exit(1); }