aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crypttab.59
1 files changed, 8 insertions, 1 deletions
diff --git a/crypttab.5 b/crypttab.5
index 73bd8aed..60f3845c 100644
--- a/crypttab.5
+++ b/crypttab.5
@@ -39,7 +39,8 @@ of the resulting encrypted block device;
the device is set up at
\fB/dev/mapper/\fIname\fR.
-The second field contains a path to the underlying block device.
+The second field contains a path to the underlying block device,
+or a specification of a block device via UUID=<device uuid>.
If the block device contains a LUKS signature,
it is opened as a LUKS encrypted partition;
otherwise it is assumed to be a raw dm-crypt partition.
@@ -51,6 +52,8 @@ Otherwise the field is interpreted as a path to a file
containing the encryption password.
For swap encryption
.B /dev/urandom
+or the hardware device
+.B /dev/hw_random
can be used as the password file;
using
.B /dev/random
@@ -86,6 +89,10 @@ If the the encryption password is read from console,
it has to be entered twice (to prevent typos).
.TP
+\fBnoauto\fR
+This device will not be automatically unlocked on boot.
+
+.TP
\fBswap\fR
The encrypted block device will be used as a swap partition,
and will be formatted as a swap partition