X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fcrypttab.xml;h=9030015b0e8fd5a39ccad843a4845bdfae041628;hb=94655a1670aef827eee6751c986da4bb4ecee6d4;hp=fae39e71b0bed06a5eb6410dd605c03f246b78d4;hpb=fa7abba2328eb2d23a7e27708f86f5013059ddcf;p=elogind.git
diff --git a/man/crypttab.xml b/man/crypttab.xml
index fae39e71b..9030015b0 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -163,6 +163,20 @@
given by the key size.
+
+ key-slot=
+
+ Specifies the key slot to
+ compare the passphrase or key against.
+ If the key slot does not match the given
+ passphrase or key, but another would, the
+ setup of the device will fail regardless.
+ This option implies luks. See
+ cryptsetup8
+ for possible values. The default is to try
+ all key slots in sequential order.
+
+
luks
@@ -261,7 +275,7 @@
tcrypt-hidden
Use the hidden TrueCrypt volume.
- This implies tcrypt.
+ This option implies tcrypt.
This will map the hidden volume that is
inside of the volume provided in the second
@@ -290,15 +304,8 @@
tcrypt-system
Use TrueCrypt in system
- encryption mode. This implies
- tcrypt.
-
- Please note that when using this mode, the
- whole device needs to be given in the second
- field instead of the partition. For example: if
- /dev/sda2 is the system
- encrypted TrueCrypt patition, /dev/sda
- has to be given.
+ encryption mode. This option implies
+ tcrypt.
@@ -362,9 +369,7 @@
luks UUID=2505567a-9e27-4efe-a4d5-15ad146c258b
swap /dev/sda7 /dev/urandom swap
truecrypt /dev/sda2 /etc/container_password tcrypt
-hidden /mnt/tc_hidden /null tcrypt-hidden,tcrypt-keyfile=/etc/keyfile
- Note that the default hash algorithm is ripemd160. If you use your system
- in FIPS mode, please specify supported hash algorithm (e.g.: hash=sha1).
+hidden /mnt/tc_hidden /dev/null tcrypt-hidden,tcrypt-keyfile=/etc/keyfile