diff options
author | pjd <pjd@FreeBSD.org> | 2004-07-05 21:16:37 +0000 |
---|---|---|
committer | pjd <pjd@FreeBSD.org> | 2004-07-05 21:16:37 +0000 |
commit | 782281411585b11c71b5fc34d535c71848a7efd9 (patch) | |
tree | f9d11c474284afcadba02b886c45bd73c725b0b6 /sbin/geom/class/label | |
parent | fe7583f88c43e3d41c4526d3f8370a0b22407f37 (diff) | |
download | FreeBSD-src-782281411585b11c71b5fc34d535c71848a7efd9.zip FreeBSD-src-782281411585b11c71b5fc34d535c71848a7efd9.tar.gz |
- Add 'stop' command, which works just like 'destroy' command, but sounds
less dangerous.
- Update manual pages and extend examples.
- Bump versions.
Diffstat (limited to 'sbin/geom/class/label')
-rw-r--r-- | sbin/geom/class/label/geom_label.c | 9 | ||||
-rw-r--r-- | sbin/geom/class/label/glabel.8 | 22 |
2 files changed, 26 insertions, 5 deletions
diff --git a/sbin/geom/class/label/geom_label.c b/sbin/geom/class/label/geom_label.c index bbd6e7f..edb0d7e 100644 --- a/sbin/geom/class/label/geom_label.c +++ b/sbin/geom/class/label/geom_label.c @@ -49,6 +49,7 @@ static void label_label(struct gctl_req *req); static void label_clear(struct gctl_req *req); struct g_command class_commands[] = { + { "clear", G_FLAG_VERBOSE, label_main, G_NULL_OPTS }, { "create", G_FLAG_VERBOSE | G_FLAG_LOADKLD, NULL, G_NULL_OPTS }, { "destroy", G_FLAG_VERBOSE, NULL, { @@ -57,7 +58,12 @@ struct g_command class_commands[] = { } }, { "label", G_FLAG_VERBOSE | G_FLAG_LOADKLD, label_main, G_NULL_OPTS }, - { "clear", G_FLAG_VERBOSE, label_main, G_NULL_OPTS }, + { "stop", G_FLAG_VERBOSE, NULL, + { + { 'f', "force", NULL, G_TYPE_NONE }, + G_OPT_SENTINEL + } + }, G_CMD_SENTINEL }; @@ -72,6 +78,7 @@ usage(const char *name) fprintf(stderr, "usage: %s create [-v] <name> <dev>\n", name); fprintf(stderr, " %s destroy [-fv] <name> [name2 [...]]\n", name); fprintf(stderr, " %s label [-v] <name> <dev>\n", name); + fprintf(stderr, " %s stop [-fv] <name> [name2 [...]]\n", name); fprintf(stderr, " %s clear [-v] <dev1> [dev2 [...]]\n", name); } diff --git a/sbin/geom/class/label/glabel.8 b/sbin/geom/class/label/glabel.8 index 4b656e2..46f20e9 100644 --- a/sbin/geom/class/label/glabel.8 +++ b/sbin/geom/class/label/glabel.8 @@ -37,12 +37,17 @@ .Ar name .Ar dev .Nm +.Cm destroy +.Op Fl fv +.Ar name +.Op Ar name Op Ar ... +.Nm .Cm label .Op Fl v .Ar name .Ar dev .Nm -.Cm destroy +.Cm stop .Op Fl fv .Ar name .Op Ar name Op Ar ... @@ -127,9 +132,13 @@ method, where metadata is stored in provider's last sector. The kernel module .Pa geom_label.ko will be loaded if it is not loaded already. -.It Cm destroy -Turn off the given labels by its +.It Cm stop +Turn off the given label by its .Ar name . +This command doesn't touch on-disk metadata! +.It Cm destroy +Same as +.Cm stop . .It Cm clear Clear metadata on the given devices. .It Cm list @@ -158,6 +167,10 @@ create a file system on it, and mount it: glabel label -v usr /dev/da2 newfs /dev/label/usr mount /dev/label/usr /usr +[...] +umount /usr +glabel stop usr +glabel unload .Ed .Pp The next example shows how to setup a label for a UFS file system: @@ -172,7 +185,8 @@ Exit status is 0 on success, and 1 if the command fails. .Xr geom 8 , .Xr mount 8 , .Xr newfs 8 , -.Xr tunefs 8 +.Xr tunefs 8 , +.Xr umount 8 .Sh HISTORY The .Nm |