summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/control3
-rw-r--r--debian/functions5
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index 2692506..501d1c2 100644
--- a/debian/control
+++ b/debian/control
@@ -40,9 +40,10 @@ Package: cryptsetup-run
Architecture: linux-any
Depends: cryptsetup-bin (>= 2:1.6.0),
dmsetup,
+ keyutils,
${misc:Depends},
${shlibs:Depends}
-Suggests: dosfstools, keyutils, liblocale-gettext-perl
+Suggests: dosfstools, liblocale-gettext-perl
Replaces: cryptsetup (<< 2:2.0.3-1), cryptsetup-bin (<< 2:2.0.3-2)
Breaks: cryptsetup (<< 2:2.0.3-1), cryptsetup-bin (<< 2:2.0.3-2)
Description: disk encryption support - startup scripts
diff --git a/debian/functions b/debian/functions
index cb889ab..6dbe82c 100644
--- a/debian/functions
+++ b/debian/functions
@@ -104,6 +104,11 @@ crypttab_parse_options() {
done
IFS=" "
+ # use decrypt_keyctl by default if no keyscript in /etc/crypttab
+ if [ -z "$CRYPTTAB_OPTION_keyscript" ]; then
+ CRYPTTAB_OPTION_keyscript="/lib/cryptsetup/scripts/decrypt_keyctl"
+ fi
+
if [ "$quiet" = "n" ] &&
[ -z "${CRYPTTAB_OPTION_luks+x}" ] && [ -n "${CRYPTTAB_OPTION_header+x}" ]; then
cryptsetup_message "WARNING: Option 'luks' missing in crypttab for target $CRYPTTAB_NAME." \