main/cryptsetup: use newest dmcrypt service version from gentoo

The findfs change has been reapplied.

1 files changed, 18 insertions, 5 deletions

diff --git a/main/cryptsetup/dmcrypt.confd b/main/cryptsetup/dmcrypt.confd
index 35a1fd2cb3..642ff08707 100644
--- a/main/cryptsetup/dmcrypt.confd
+++ b/main/cryptsetup/dmcrypt.confd
@@ -26,19 +26,30 @@
 # Global options:
 #----------------
 
-# Max number of checks to perform (1 per second)
-#dmcrypt_max_timeout=120
+# How long to wait for each timeout (in seconds).
+dmcrypt_key_timeout=1
+
+# Max number of checks to perform (see dmcrypt_key_timeout).
+#dmcrypt_max_timeout=300
+
+# Number of password retries.
+dmcrypt_retries=5
 
 # Arguments:
 #-----------
 # target=<name>                      == Mapping name for partition.
 # swap=<name>                        == Mapping name for swap partition.
 # source='<dev>'                     == Real device for partition.
+#                                    Note: You can (and should) specify a tag like UUID
+#                                    for blkid (see -t option).  This is safer than using
+#                                    the full path to the device.
 # key='</path/to/keyfile>[:<mode>]'  == Fullpath from / or from inside removable media.
 # remdev='<dev>'                     == Device that will be assigned to removable media.
 # gpg_options='<opts>'               == Default are --quiet --decrypt
 # options='<opts>'                   == cryptsetup, for LUKS you can only use --readonly
 # loop_file='<file>'                 == Loopback file.
+#                                    Note: If you omit $source, then a free loopback will
+#                                    be looked up automatically.
 # pre_mount='cmds'                   == commands to execute before mounting partition.
 # post_mount='cmds'                  == commands to execute after mounting partition.
 #-----------
@@ -79,13 +90,13 @@
 #key='/full/path/to/homekey'
 #remdev='/dev/sda1'
 
-##/home with gpg protected key on removable media(such as usb-stick)
+## /home with gpg protected key on removable media(such as usb-stick)
 #target=crypt-home
 #source='/dev/hda5'
 #key='/full/path/to/homekey:gpg'
 #remdev='/dev/sda1'
 
-##/tmp with regular keyfile
+## /tmp with regular keyfile
 #target=crypt-tmp
 #source='/dev/hda6'
 #key='/full/path/to/tmpkey'
@@ -93,6 +104,8 @@
 #post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}'
 
 ## Loopback file example
-#mount='crypt-loop-home'
+#target='crypt-loop-home'
 #source='/dev/loop0'
 #loop_file='/mnt/crypt/home'
+
+# The file must be terminated by a newline.  Or leave this comment last.