Module Name: src
Committed By: wiz
Date: Tue May 19 22:39:52 UTC 2009
Modified Files:
src/sbin/modload: main.c modload.8
Log Message:
Sync usage and man page.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/modload/main.c
cvs rdiff -u -r1.30 -r1.31 src/sbin/modload/modload.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/modload/main.c
diff -u src/sbin/modload/main.c:1.5 src/sbin/modload/main.c:1.6
--- src/sbin/modload/main.c:1.5 Tue May 19 22:09:59 2009
+++ src/sbin/modload/main.c Tue May 19 22:39:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.5 2009/05/19 22:09:59 jnemeth Exp $ */
+/* $NetBSD: main.c,v 1.6 2009/05/19 22:39:52 wiz Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.5 2009/05/19 22:09:59 jnemeth Exp $");
+__RCSID("$NetBSD: main.c,v 1.6 2009/05/19 22:39:52 wiz Exp $");
#endif /* !lint */
#include <sys/module.h>
@@ -199,9 +199,10 @@
{
(void)fprintf(stderr,
- "Usage: %s [-b var=boolean] [-f] [-i var=integer] "
- "[-s var=string]\n"
- " {-p|<module_name>}\n",
- getprogname());
+ "Usage: %s [-f] [-b var=boolean] [-i var=integer] "
+ "[-s var=string] module\n"
+ " %s -p [-b var=boolean] [-i var=integer] "
+ "[-s var=string]\n",
+ getprogname(), getprogname());
exit(EXIT_FAILURE);
}
Index: src/sbin/modload/modload.8
diff -u src/sbin/modload/modload.8:1.30 src/sbin/modload/modload.8:1.31
--- src/sbin/modload/modload.8:1.30 Tue May 19 22:35:41 2009
+++ src/sbin/modload/modload.8 Tue May 19 22:39:52 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: modload.8,v 1.30 2009/05/19 22:35:41 wiz Exp $
+.\" $NetBSD: modload.8,v 1.31 2009/05/19 22:39:52 wiz Exp $
.\"
.\" Copyright (c) 1993 Christopher G. Demetriou
.\" All rights reserved.
@@ -41,15 +41,15 @@
.Sh SYNOPSIS
.Nm
.Op Fl f
-.Op Fl b Ar name=val
-.Op Fl i Ar name=val
-.Op Fl s Ar name=val
+.Op Fl b Ar var=boolean
+.Op Fl i Ar var=integer
+.Op Fl s Ar var=string
.Ar module
.Nm
.Fl p
-.Op Fl b Ar name=val
-.Op Fl i Ar name=val
-.Op Fl s Ar name=val
+.Op Fl b Ar var=boolean
+.Op Fl i Ar var=integer
+.Op Fl s Ar var=string
.Sh DESCRIPTION
The
.Nm
@@ -63,11 +63,11 @@
The options to
.Nm
are as follows:
-.Bl -tag -width xbxnamexvalx
-.It Fl b Ar name=val
+.Bl -tag -width xbxvarxbooleanx
+.It Fl b Ar var=boolean
Pass the module a boolean property with the name
-.Ar name .
-.Ar val
+.Ar var .
+.Ar boolean
may be either
.Dv true
or
@@ -80,19 +80,19 @@
.Em Note :
an incompatible module can cause system instability, including data
loss or corruption.
-.It Fl i Ar name=val
+.It Fl i Ar var=integer
Pass the module an integer property with the name
-.Ar name
+.Ar var
and integral value
-.Ar val .
+.Ar integer .
.It Fl p
Output a property list suitable for loading along with a module.
When using this option, you do not need to specify a module.
-.It Fl s Ar name=val
+.It Fl s Ar var=string
Pass the module a string property with the name
-.Ar name
+.Ar var
and string value
-.Ar val .
+.Ar string .
.El
.Sh DIAGNOSTICS
The