CVS commit: src/usr.bin/rump_wmd
Module Name:src Committed By: pooka Date: Tue Jan 28 14:02:54 UTC 2014 Modified Files: src/usr.bin/rump_wmd: rump_wmd.1 Log Message: Clarify that -l params must be given after options. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_wmd/rump_wmd.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/rump_wmd/rump_wmd.1 diff -u src/usr.bin/rump_wmd/rump_wmd.1:1.2 src/usr.bin/rump_wmd/rump_wmd.1:1.3 --- src/usr.bin/rump_wmd/rump_wmd.1:1.2 Thu Jan 16 09:54:05 2014 +++ src/usr.bin/rump_wmd/rump_wmd.1 Tue Jan 28 14:02:54 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: rump_wmd.1,v 1.2 2014/01/16 09:54:05 wiz Exp $ +.\" $NetBSD: rump_wmd.1,v 1.3 2014/01/28 14:02:54 pooka Exp $ .\" .\" Copyright (c) 2014 Antti Kantee. All rights reserved. .\" @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 16, 2014 +.Dd January 28, 2014 .Dt RUMP_WMD 1 .Os .Sh NAME @@ -32,7 +32,7 @@ .Sh SYNOPSIS .Nm .Op Fl hv -.Op Fl L Ar libdir +.Op Fl L Ar dir .Fl l Ar component .Sh DESCRIPTION The @@ -51,20 +51,22 @@ The command line options are: .Bl -tag -width indent .It Fl h Print the usage. -.It Fl L Ar libdir +.It Fl L Ar dir By default, rump kernel components in .Pa /usr/lib are examined. If this option is supplied, components in -.Ar libdir +.Ar dir are examined instead. -.It Fl l Ar component -Resolve dependencies for the given component. -This option may be given multiple time. .It Fl v Increase debug output from the utility. This option may be given multiple times. .El +.Pp +The desired components are given using +.Fl l Ar component . +This parameter may be specified multiple time and must be the last +set of parameters. .Sh EXAMPLES Resolve dependencies for FFS: .Bd -literal -offset indent
CVS commit: src/usr.bin/rump_wmd
Module Name:src
Committed By: pooka
Date: Tue Jan 28 13:58:25 UTC 2014
Modified Files:
src/usr.bin/rump_wmd: rump_wmd.sh
Log Message:
* make -h actually work
* give usage for invalid usage
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/rump_wmd/rump_wmd.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rump_wmd/rump_wmd.sh
diff -u src/usr.bin/rump_wmd/rump_wmd.sh:1.3 src/usr.bin/rump_wmd/rump_wmd.sh:1.4
--- src/usr.bin/rump_wmd/rump_wmd.sh:1.3 Tue Jan 28 13:56:02 2014
+++ src/usr.bin/rump_wmd/rump_wmd.sh Tue Jan 28 13:58:25 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: rump_wmd.sh,v 1.3 2014/01/28 13:56:02 pooka Exp $
+# $NetBSD: rump_wmd.sh,v 1.4 2014/01/28 13:58:25 pooka Exp $
#
# Copyright (c) 2014 Antti Kantee
#
@@ -44,7 +44,7 @@ usage ()
}
unset FIRSTLIB
-while getopts 'l:L:v' opt; do
+while getopts 'hl:L:v' opt; do
case "${opt}" in
l)
: ${FIRSTLIB:=${OPTIND}}
@@ -62,6 +62,7 @@ while getopts 'l:L:v' opt; do
;;
esac
done
+[ -z "${FIRSTLIB}" ] && usage
shift $((${FIRSTLIB} - 2))
[ $# -eq 0 ] && usage
CVS commit: src/usr.bin/rump_wmd
Module Name:src Committed By: pooka Date: Tue Jan 28 13:56:02 UTC 2014 Modified Files: src/usr.bin/rump_wmd: rump_wmd.sh Log Message: rcs id police *uuu-aaa, uuu-aaa* To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_wmd/rump_wmd.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/rump_wmd/rump_wmd.sh diff -u src/usr.bin/rump_wmd/rump_wmd.sh:1.2 src/usr.bin/rump_wmd/rump_wmd.sh:1.3 --- src/usr.bin/rump_wmd/rump_wmd.sh:1.2 Thu Jan 16 09:54:05 2014 +++ src/usr.bin/rump_wmd/rump_wmd.sh Tue Jan 28 13:56:02 2014 @@ -1,5 +1,7 @@ #!/bin/sh # +# $NetBSD: rump_wmd.sh,v 1.3 2014/01/28 13:56:02 pooka Exp $ +# # Copyright (c) 2014 Antti Kantee # # Redistribution and use in source and binary forms, with or without
CVS commit: src/usr.bin/rump_wmd
Module Name:src
Committed By: wiz
Date: Thu Jan 16 09:54:05 UTC 2014
Modified Files:
src/usr.bin/rump_wmd: rump_wmd.1 rump_wmd.sh
Log Message:
Sort options and option descriptions.
Document -h.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/rump_wmd/rump_wmd.1 \
src/usr.bin/rump_wmd/rump_wmd.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/rump_wmd/rump_wmd.1
diff -u src/usr.bin/rump_wmd/rump_wmd.1:1.1 src/usr.bin/rump_wmd/rump_wmd.1:1.2
--- src/usr.bin/rump_wmd/rump_wmd.1:1.1 Thu Jan 16 01:54:47 2014
+++ src/usr.bin/rump_wmd/rump_wmd.1 Thu Jan 16 09:54:05 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: rump_wmd.1,v 1.1 2014/01/16 01:54:47 pooka Exp $
+.\" $NetBSD: rump_wmd.1,v 1.2 2014/01/16 09:54:05 wiz Exp $
.\"
.\" Copyright (c) 2014 Antti Kantee. All rights reserved.
.\"
@@ -31,8 +31,8 @@
.Nd Resolve rump kernel component dependencies
.Sh SYNOPSIS
.Nm
+.Op Fl hv
.Op Fl L Ar libdir
-.Op Fl v
.Fl l Ar component
.Sh DESCRIPTION
The
@@ -49,6 +49,8 @@ is accepted as command line input by
.Pp
The command line options are:
.Bl -tag -width indent
+.It Fl h
+Print the usage.
.It Fl L Ar libdir
By default, rump kernel components in
.Pa /usr/lib
@@ -56,12 +58,12 @@ are examined.
If this option is supplied, components in
.Ar libdir
are examined instead.
-.It Fl v
-Increase debug output from the utility.
-This option may be given multiple times.
.It Fl l Ar component
Resolve dependencies for the given component.
This option may be given multiple time.
+.It Fl v
+Increase debug output from the utility.
+This option may be given multiple times.
.El
.Sh EXAMPLES
Resolve dependencies for FFS:
@@ -80,6 +82,8 @@ DEBUG0: Searching component combinations
DEBUG0: Found a set
-lrumpnet -lrumpnet_net -lrumpvfs -lrumpfs_nfs -lrumpnet_netinet6 -lrumpnet_virtif
.Ed
+.Sh SEE ALSO
+.Xr rump_server 1
.Sh CAVEATS
Since
.Nm
@@ -87,8 +91,6 @@ uses trial-and-error brute force resolut
If several seconds are spent for dependency resolution, the benefit of
a rump kernel booting in 10ms is somewhat lost.
Caching the output is highly recommended.
-.Sh FUNFACTS
+.Sh FUN FACTS
.Nm
is short for "rump, where's my dependency".
-.Sh SEE ALSO
-.Xr rump_server 1
Index: src/usr.bin/rump_wmd/rump_wmd.sh
diff -u src/usr.bin/rump_wmd/rump_wmd.sh:1.1 src/usr.bin/rump_wmd/rump_wmd.sh:1.2
--- src/usr.bin/rump_wmd/rump_wmd.sh:1.1 Thu Jan 16 01:54:47 2014
+++ src/usr.bin/rump_wmd/rump_wmd.sh Thu Jan 16 09:54:05 2014
@@ -38,7 +38,7 @@ die ()
usage ()
{
- die "Usage: $0 [-v] [-L libdir] -lrump_component [...]"
+ die "Usage: $0 [-hv] [-L libdir] -lrump_component [...]"
}
unset FIRSTLIB
