summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2004-05-21 15:23:48 +0000
committerpjd <pjd@FreeBSD.org>2004-05-21 15:23:48 +0000
commitb400b04c0558e70dfef123cca8773dfb58fc83bb (patch)
tree4c7bf34ff8dcf9c95847f75f308aba718b7b2170
parente7578c3795e2978e62ac24580afb7f9486ddf33b (diff)
downloadFreeBSD-src-b400b04c0558e70dfef123cca8773dfb58fc83bb.zip
FreeBSD-src-b400b04c0558e70dfef123cca8773dfb58fc83bb.tar.gz
- Change command name from 'config' to 'configure'.
- Bump version number.
-rw-r--r--sbin/geom/class/nop/geom_nop.c6
-rw-r--r--sys/geom/nop/g_nop.c6
-rw-r--r--sys/geom/nop/g_nop.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/sbin/geom/class/nop/geom_nop.c b/sbin/geom/class/nop/geom_nop.c
index 04abfd9..e1840c9 100644
--- a/sbin/geom/class/nop/geom_nop.c
+++ b/sbin/geom/class/nop/geom_nop.c
@@ -47,7 +47,7 @@ struct g_command class_commands[] = {
G_OPT_SENTINEL
}
},
- { "config", G_FLAG_VERBOSE, NULL,
+ { "configure", G_FLAG_VERBOSE, NULL,
{
{ 'f', "failprob", &failprob, G_TYPE_NUMBER },
G_OPT_SENTINEL
@@ -68,6 +68,6 @@ usage(const char *name)
{
fprintf(stderr, "usage: %s create [-v] [-f failprob] <dev1> [dev2 [...]]\n", name);
- fprintf(stderr, " %s config [-v] [-f failprob] <dev1> [dev2 [...]]\n", name);
- fprintf(stderr, " %s destroy [-fv] <dev1> [dev2 [...]]\n", name);
+ fprintf(stderr, " %s configure [-v] [-f failprob] <prov1> [prov2 [...]]\n", name);
+ fprintf(stderr, " %s destroy [-fv] <prov1> [prov2 [...]]\n", name);
}
diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index 63e04c8..df666bf 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -266,7 +266,7 @@ g_nop_ctl_create(struct gctl_req *req, struct g_class *mp)
}
static void
-g_nop_ctl_config(struct gctl_req *req, struct g_class *mp)
+g_nop_ctl_configure(struct gctl_req *req, struct g_class *mp)
{
struct g_provider *pp;
intmax_t *failprob;
@@ -395,8 +395,8 @@ g_nop_config(struct gctl_req *req, struct g_class *mp, const char *verb)
if (strcmp(verb, "create") == 0) {
g_nop_ctl_create(req, mp);
return;
- } else if (strcmp(verb, "config") == 0) {
- g_nop_ctl_config(req, mp);
+ } else if (strcmp(verb, "configure") == 0) {
+ g_nop_ctl_configure(req, mp);
return;
} else if (strcmp(verb, "destroy") == 0) {
g_nop_ctl_destroy(req, mp);
diff --git a/sys/geom/nop/g_nop.h b/sys/geom/nop/g_nop.h
index 59dbdde..b107bda 100644
--- a/sys/geom/nop/g_nop.h
+++ b/sys/geom/nop/g_nop.h
@@ -30,7 +30,7 @@
#define _G_NOP_H_
#define G_NOP_CLASS_NAME "NOP"
-#define G_NOP_VERSION 0
+#define G_NOP_VERSION 1
#define G_NOP_SUFFIX ".nop"
#ifdef _KERNEL
OpenPOWER on IntegriCloud