d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change option dry-run from 'n' to 'C' in geli attach command.

Browse Source 
'n' is used in other commands to define the key index.
We should be consistent with that.
'C' option is used by patch(1) to perform dryrun so lets use that.

Reviewed by:	allanjude
Differential Revision:	https://reviews.freebsd.org/D15308
This commit is contained in:
oshogbo 2018-05-09 20:51:16 +00:00
parent 069c7c9461
commit 062a74876b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/geom/class/eli/geli.8
View File

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd April 10, 2018
.Dd May 9, 2018
.Dt GELI 8
.Os
.Sh NAME
@ -67,7 +67,7 @@ utility:
.Cm init
.Nm
.Cm attach
.Op Fl dnprv
.Op Fl Cdprv
.Op Fl j Ar passfile
.Op Fl k Ar keyfile
.Ar prov
@ -393,6 +393,9 @@ suffix.
.Pp
Additional options include:
.Bl -tag -width ".Fl j Ar passfile"
.It Fl C
Do a dry-run decryption.
This is useful to verify passphrase and keyfile without decrypting the device.
.It Fl d
If specified, a decrypted provider will be detached automatically on last close.
This can help with scarce memory so the user does not have to remember to detach the
@ -420,9 +423,6 @@ For more information see the description of the
option for the
.Cm init
subcommand.
.It Fl n
Do a dry-run decryption.
This is useful to verify passphrase and keyfile without decrypting the device.
.It Fl p
Do not use a passphrase as a component of the User Key.
Cannot be combined with the

6
sbin/geom/class/eli/geom_eli.c
View File

@ -86,7 +86,7 @@ static int eli_backup_create(struct gctl_req *req, const char *prov,
*
* init [-bdgPTv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-J newpassfile] [-K newkeyfile] [-s sectorsize] [-V version] prov
* label - alias for 'init'
* attach [-dprv] [-j passfile] [-k keyfile] prov
* attach [-Cdprv] [-j passfile] [-k keyfile] prov
* detach [-fl] prov ...
* stop - alias for 'detach'
* onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov
@ -145,15 +145,15 @@ struct g_command class_commands[] = {
},
{ "attach", G_FLAG_VERBOSE | G_FLAG_LOADKLD, eli_main,
{
{ 'C', "dryrun", NULL, G_TYPE_BOOL },
{ 'd', "detach", NULL, G_TYPE_BOOL },
{ 'j', "passfile", G_VAL_OPTIONAL, G_TYPE_STRING | G_TYPE_MULTI },
{ 'k', "keyfile", G_VAL_OPTIONAL, G_TYPE_STRING | G_TYPE_MULTI },
{ 'n', "dryrun", NULL, G_TYPE_BOOL },
{ 'p', "nopassphrase", NULL, G_TYPE_BOOL },
{ 'r', "readonly", NULL, G_TYPE_BOOL },
G_OPT_SENTINEL
},
"[-dnprv] [-j passfile] [-k keyfile] prov"
"[-Cdprv] [-j passfile] [-k keyfile] prov"
},
{ "detach", 0, NULL,
{