daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
b9a53a
From fdb86185b56619c59602c6546fd0710eec4a6e85 Mon Sep 17 00:00:00 2001
b9a53a
From: shinygold <10763595+shinygold@users.noreply.github.com>
b9a53a
Date: Tue, 16 Jul 2019 13:05:34 +0200
b9a53a
Subject: [PATCH] cryptsetup: add documentation for keyfile-timeout
b9a53a
b9a53a
(cherry picked from commit 4e1334512debb27f4a0c4a6da237a4b8d59fea08)
b9a53a
b9a53a
Related: #1763155
b9a53a
---
b9a53a
 man/crypttab.xml | 14 +++++++++++++-
b9a53a
 1 file changed, 13 insertions(+), 1 deletion(-)
b9a53a
b9a53a
diff --git a/man/crypttab.xml b/man/crypttab.xml
b9a53a
index 3574ce00da..6074315980 100644
b9a53a
--- a/man/crypttab.xml
b9a53a
+++ b/man/crypttab.xml
b9a53a
@@ -150,6 +150,17 @@
b9a53a
         sequential order.</para></listitem>
b9a53a
       </varlistentry>
b9a53a
 
b9a53a
+      <varlistentry>
b9a53a
+        <term><option>keyfile-timeout=</option></term>
b9a53a
+
b9a53a
+        <listitem><para> Specifies the timeout for the device on
b9a53a
+        which the key file resides and falls back to a password if
b9a53a
+        it could not be mounted. See
b9a53a
+        <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
b9a53a
+        for key files on external devices.
b9a53a
+        </para></listitem>
b9a53a
+      </varlistentry>
b9a53a
+
b9a53a
       <varlistentry>
b9a53a
         <term><option>luks</option></term>
b9a53a
 
b9a53a
@@ -417,7 +428,8 @@
b9a53a
       <programlisting>luks       UUID=2505567a-9e27-4efe-a4d5-15ad146c258b
b9a53a
 swap       /dev/sda7       /dev/urandom       swap
b9a53a
 truecrypt  /dev/sda2       /etc/container_password  tcrypt
b9a53a
-hidden     /mnt/tc_hidden  /dev/null    tcrypt-hidden,tcrypt-keyfile=/etc/keyfile</programlisting>
b9a53a
+hidden     /mnt/tc_hidden  /dev/null    tcrypt-hidden,tcrypt-keyfile=/etc/keyfile
b9a53a
+external   /dev/sda3       keyfile:LABEL=keydev keyfile-timeout=10s</programlisting>
b9a53a
     </example>
b9a53a
   </refsect1>
b9a53a