← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libpam-mount/trusty-proposed

« back to all changes in this revision

Viewing changes to doc/pam_mount.conf.5.in

  • Committer: Bazaar Package Importer
  • Author(s): Bastian Kleineidam
  • Date: 2010-05-19 04:05:25 UTC
  • mfrom: (1.4.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100519040525-yym18fn8k070smfe
Tags: 2.3-1
http://bugs.debian.org/528366
http://bugs.debian.org/581713
* New upstream release.
  + mount.crypt passes keyfile info to open LUKS volumes
    (Closes: #528366)
  + umount.crypt works again (Closes: #581713)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/pam_mount.conf.5.in
109
109
Cryptsetup cipher name for the volume. To be used with the \fBcrypt\fP fstype.
110
110
.TP
111
111
\fBfskeycipher="\fP\fIciphertype\fP\fB"\fP
112
 
OpenSSL cipher name for the fskey. Use with the \fBcrypt\fP fstype
113
 
(dm\-crypt and LUKS).
 
112
OpenSSL cipher name for the fskey. Use with the \fBcrypt\fP fstype (dm\-crypt
 
113
and LUKS). The special cipher keyword "\fBnone\fP" may be used to directly pass
 
114
the file's contents to cryptsetup without decryption by OpenSSL.
114
115
.TP
115
116
\fBfskeyhash="\fP\fIhash\fP\fB"\fP
116
117
OpenSSL hash name for the fskey.