Page MenuHomeFreeBSD
Files F151055692

D15308.id.diff
No OneTemporary
Actions

D15308.id.diff
View Options

Index: head/sbin/geom/class/eli/geli.8
===================================================================
--- head/sbin/geom/class/eli/geli.8
+++ head/sbin/geom/class/eli/geli.8
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 10, 2018
+.Dd May 9, 2018
.Dt GELI 8
.Os
.Sh NAME
@@ -67,7 +67,7 @@
.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 @@
.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 @@
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
Index: head/sbin/geom/class/eli/geom_eli.c
===================================================================
--- head/sbin/geom/class/eli/geom_eli.c
+++ head/sbin/geom/class/eli/geom_eli.c
@@ -86,7 +86,7 @@
*
* 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 @@
},
{ "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,
{

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 6, 4:51 PM (2 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30986175
Default Alt Text
D15308.id.diff (2 KB)

Event Timeline