From e920b6a2073ed82b78e26193b0ea3fc2b04a3be0 Mon Sep 17 00:00:00 2001
From: Jason McIntyre <jmc@cvs.openbsd.org>
Date: Tue, 20 Feb 2007 14:01:16 +0000
Subject: sort options and sync usage(); from Igor Sobrado

---
 sbin/modload/modload.8 | 46 +++++++++++++++++++++++-----------------------
 sbin/modload/modload.c |  6 +++---
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'sbin')

diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8
index 562b501ab20..11cd1fae8b2 100644
--- a/sbin/modload/modload.8
+++ b/sbin/modload/modload.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: modload.8,v 1.21 2002/01/09 18:23:31 mpech Exp $
+.\" $OpenBSD: modload.8,v 1.22 2007/02/20 14:01:15 jmc Exp $
 .\" $NetBSD: modload.8,v 1.17 2001/11/16 11:57:16 wiz Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -41,11 +41,11 @@
 .Nd load a kernel module
 .Sh SYNOPSIS
 .Nm modload
-.Op Fl dnvsS
+.Op Fl dnSsv
 .Op Fl A Ar kernel
 .Op Fl e Ar entry
-.Op Fl p Ar postinstall
 .Op Fl o Ar output_file
+.Op Fl p Ar postinstall
 .Ar input_file
 .Sh DESCRIPTION
 The
@@ -57,28 +57,16 @@ The options to
 .Nm
 are as follows:
 .Bl -tag -width Ds
-.It Fl d
-Debug.
-Used to debug
-.Nm
-itself.
-.It Fl n
-Do everything, except calling the module entry point (and any
-post-install program).
-.It Fl v
-Print comments about the loading process.
-.It Fl s
-Do not load symbols from the kernel module.
-.It Fl S
-Do not remove the temporary object file.
-By default, the
-.Xr ld 1
-output is removed after being loaded into the kernel.
 .It Fl A Ar kernel
 Specify the file that is passed to the linker
 to resolve module references to external symbols.
 The symbol file must be for the currently running
 kernel or the module is likely to crash the system.
+.It Fl d
+Debug.
+Used to debug
+.Nm
+itself.
 .It Fl e Ar entry
 Specify the module entry point.
 This is passed by
@@ -90,6 +78,12 @@ The default module entry point name is `xxxinit'.
 If `xxxinit' cannot be found, an attempt to use `<module_name>_lkmentry'
 will be made, where <module_name> is the filename being loaded without
 the `.o'.
+.It Fl n
+Do everything, except calling the module entry point (and any
+post-install program).
+.It Fl o Ar output_file
+Specify the name of the output file that is produced by
+the linker.
 .It Fl p Ar postinstall
 Specify the name of a shell script or program that will
 be executed if the module is successfully loaded.
@@ -99,9 +93,15 @@ For loadable drivers, the third argument is
 the block or character major device number.
 For a loadable system call, the third argument is the system
 call number.
-.It Fl o Ar output_file
-Specify the name of the output file that is produced by
-the linker.
+.It Fl S
+Do not remove the temporary object file.
+By default, the
+.Xr ld 1
+output is removed after being loaded into the kernel.
+.It Fl s
+Do not load symbols from the kernel module.
+.It Fl v
+Print comments about the loading process.
 .El
 .Sh FILES
 .Bl -tag -width /usr/include/sys/lkm.h -compact
diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c
index ee10be48bf0..f081e7418a2 100644
--- a/sbin/modload/modload.c
+++ b/sbin/modload/modload.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: modload.c,v 1.41 2003/08/06 20:37:25 millert Exp $	*/
+/* 	$OpenBSD: modload.c,v 1.42 2007/02/20 14:01:15 jmc Exp $	*/
 /*	$NetBSD: modload.c,v 1.30 2001/11/08 15:33:15 christos Exp $	*/
 
 /*
@@ -111,9 +111,9 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "usage: %s [-dnsvS] [-A system] [-e entry]\n",
+	fprintf(stderr, "usage: %s [-dnSsv] [-A kernel] [-e entry]\n",
 	    __progname);
-	fprintf(stderr, "\t[-p postinstall] [-o outputfile] <input file>\n");
+	fprintf(stderr, "\t[-o output_file] [-p postinstall] input_file\n");
 	exit(1);
 }
 
-- 
cgit v1.2.3