From 46583fa4450e1ef1284c10c2aad25631f217d2a8 Mon Sep 17 00:00:00 2001 From: Jaromil Date: Fri, 30 Jan 2015 02:00:07 +0100 Subject: [PATCH] tidying up the documentation --- README.md | 9 +++++---- tomb | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c4b9685..64e6d55 100644 --- a/README.md +++ b/README.md @@ -144,10 +144,11 @@ contents of a Tomb using a dm-crypt enabled Linux kernel, cryptsetup and GnuPG issuing the following commands as root: ``` - lo=$(losetup -f) - losetup -f secret.tomb - gpg -d secret.key | cryptsetup --key-file - luksOpen $lo secret - mount /dev/mapper/secret $HOME/secret-contents +lo=$(losetup -f) +losetup -f secret.tomb +pass="$(gpg -d secret.key)" +echo -n -e "$pass" | cryptsetup --key-file - luksOpen $lo secret +mount /dev/mapper/secret /mnt ``` diff --git a/tomb b/tomb index 0ffec16..a300287 100755 --- a/tomb +++ b/tomb @@ -620,12 +620,10 @@ usage() { _print " -s size of the tomb file when creating/resizing one (in MB)" _print " -k path to the key to be used ('-k -' to read from stdin)" _print " -n don't process the hooks found in tomb" - _print " -o options passed to local command, e.g.:" - _print " - mount options used to open (default: rw,noatime,nodev)" - _print " - an alternate cipher to forge and lock" + _print " -o options passed to commands: open, lock, forge (see man)" _print " -f force operation (i.e. even if swap is active)" [[ $KDF == 1 ]] && { - _print " --kdf generate passwords armored against dictionary attacks" + _print " --kdf forge keys armored against dictionary attacks" } _print "\000" @@ -1991,6 +1989,8 @@ awk "/mapper/"' { print $2 ";" $3 ";" $4 ";" $5 }'` _message "::1 tombname:: open on ::2 tombmount:: using ::3 tombfsopts::" \ $tombname $tombmount $tombfsopts + _verbose "::1 tombname:: /dev/::2 tombloop:: device mounted (detach with losetup -d)" $tombname $tombloop + _message "::1 tombname:: open since ::2 tombsince::" $tombname $tombsince [[ -z "$tombtty" ]] || {