From f3c3b22355f1b1e91b9ca56a1035846364f467b4 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 28 Dec 2017 19:05:34 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 .etckeeper                                    |  2 +-
 conf.d/dmcrypt                                | 23 +++++++++++++++----
 .../conf.d/{dmcrypt.dist.new => dmcrypt.dist} |  0
 3 files changed, 19 insertions(+), 6 deletions(-)
 rename config-archive/etc/conf.d/{dmcrypt.dist.new => dmcrypt.dist} (100%)

diff --git a/.etckeeper b/.etckeeper
index 9f2a85d3..961ea3f7 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -427,7 +427,7 @@ maybe chmod 0644 'config-archive/etc/conf.d/acpid.dist'
 maybe chmod 0644 'config-archive/etc/conf.d/alsasound'
 maybe chmod 0644 'config-archive/etc/conf.d/alsasound.dist'
 maybe chmod 0644 'config-archive/etc/conf.d/dmcrypt'
-maybe chmod 0644 'config-archive/etc/conf.d/dmcrypt.dist.new'
+maybe chmod 0644 'config-archive/etc/conf.d/dmcrypt.dist'
 maybe chmod 0644 'config-archive/etc/conf.d/fsck'
 maybe chmod 0644 'config-archive/etc/conf.d/fsck.dist'
 maybe chmod 0644 'config-archive/etc/conf.d/g15daemon'
diff --git a/conf.d/dmcrypt b/conf.d/dmcrypt
index 35a1fd2c..642ff087 100644
--- a/conf.d/dmcrypt
+++ b/conf.d/dmcrypt
@@ -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.
diff --git a/config-archive/etc/conf.d/dmcrypt.dist.new b/config-archive/etc/conf.d/dmcrypt.dist
similarity index 100%
rename from config-archive/etc/conf.d/dmcrypt.dist.new
rename to config-archive/etc/conf.d/dmcrypt.dist
-- 
2.39.5