parent eb20a2681362520a9728038a9ff3bdbba58eb1cb (v2.11-1-geb20a26) commit 2f8daad6ee71bade802f78e5072410e46bfd74c1 Author: Jan Engelhardt Date: Wed Aug 10 12:48:49 2011 +0200 config: default to calling umount.crypt directly As long as utab (no mtab or ro mtab) is not supported, at least try to get the user's volumes unmounted on logout. --- doc/changelog.txt | 1 + src/rdconf1.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/doc/changelog.txt b/doc/changelog.txt index d14828f..d99e52f 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -3,6 +3,7 @@ For details, see the history as recorded in the git repository. HEAD ==== +config: default to calling umount.crypt directly v2.11 (2011-08-07) diff --git a/src/rdconf1.c b/src/rdconf1.c index 37b465c..e64df06 100644 --- a/src/rdconf1.c +++ b/src/rdconf1.c @@ -1367,7 +1367,7 @@ static const struct pmt_command default_command[] = { {CMD_NFSMOUNT, "nfs4"}, {CMD_LCLMOUNT, NULL, {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}}, {CMD_CRYPTMOUNT, "crypt", {"mount", "-t", "crypt", "%(if %(CIPHER),-ocipher=%(CIPHER))", "%(if %(FSKEYCIPHER),-ofsk_cipher=%(FSKEYCIPHER))", "%(if %(FSKEYHASH),-ofsk_hash=%(FSKEYHASH))", "%(if %(FSKEYPATH),-okeyfile=%(FSKEYPATH))", "%(if %(OPTIONS),-o%(OPTIONS))", "%(VOLUME)", "%(MNTPT)", NULL}}, - {CMD_CRYPTUMOUNT, "crypt", {"umount", "%(MNTPT)", NULL}}, + {CMD_CRYPTUMOUNT, "crypt", {"umount.crypt", "%(MNTPT)", NULL}}, {CMD_UMOUNT, NULL, {"umount", "%(MNTPT)", NULL}}, {CMD_FSCK, NULL, {"fsck", "-p", "%(FSCKTARGET)", NULL}}, {CMD_PMVARRUN, NULL, {"pmvarrun", "-u", "%(USER)", "-o", "%(OPERATION)", NULL}}, -- # Created with git-export-patch