X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-crypt.8.txt;h=34a4dc2a56cd60ceaa892fbf58d89b8e336cee1e;hb=d3e5faee12695000dc06bac50cd4f8b820bc9727;hp=07bb54e6d34c1a0346304c3983618874dc8ff66d;hpb=927bbefa8782ae7d31084a089e084720423ec9fa;p=grml-crypt.git

diff --git a/grml-crypt.8.txt b/grml-crypt.8.txt
index 07bb54e..34a4dc2 100644
--- a/grml-crypt.8.txt
+++ b/grml-crypt.8.txt
@@ -32,9 +32,9 @@ ACTIONS
     Commands: [losetup], dd, cryptsetup luksFormat, cryptsetup
     luksOpen, [dd], mkfs, [mount]
 
-*start <device/file> <mountpoint>*::
+*start <device/file> [mountpoint]*::
     Starts an encrypted <device/file> and mounts it to the given
-    mountpoint. Commands: [losetup], cryptsetup luksOpen, mount
+    or a default mountpoint. Commands: [losetup], cryptsetup luksOpen, mount
 
 *stop <mountpoint>*::
     Stops an encrypted filesystem mounted at <mountpoint>. Even the
@@ -82,7 +82,7 @@ Shows what is going on (more v => more out).
 
 *-F*::
     Only for action start: Run fsck on the filesystem before mounting it to
-    the given mountpoint.
+    the given mountpoint. If given twice, use fsck's -f option as well.
 
 *-m*::
     Additional arguments passed through to mount. Could be like "'-o noatime'".
@@ -128,20 +128,20 @@ INITIALISATION MODES
 EXAMPLES
 --------
 
-*grml-crypt -t xfs -o format /dev/hda4 /mnt/tmp*::
+*grml-crypt -t xfs -o format /dev/hda4 /media/tmp*::
     Formats /dev/hda4 with xfs and applies optimized initialisation rules and
-    mounts it to /mnt/tmp
+    mounts it to /media/tmp
 
-*grml-crypt -t ext2 -z format /home/user/test.img /mnt/tmp*::
+*grml-crypt -t ext2 -z format /home/user/test.img /media/tmp*::
     Creates /home/user/test.img with 10MB and applies only insecure
     initialisation rules.  Creates an ext2 filesystem on it and mounts it to
-    /mnt/tmp.
+    /media/tmp.
 
-*grml-crypt -f -S 256 -C aes-plain -I 2 -A --verify-passphrase -m \'-o noatime\' -vvv format img /mnt/tmp*::
+*grml-crypt -f -S 256 -C aes-plain -I 2 -A --verify-passphrase -m \'-o noatime\' -vvv format img /media/tmp*::
     Reuses the image img with no initialisation. The encryption is established
     with aes-plain with 256 bit keysize and an iteration time of 2 seconds.
     Cryptsetup is advised to verify the password by asking for it twice. Mounts
-    it to /mnt/tmp with '-o noatime'. And prints what is going on (-vvv).
+    it to /media/tmp with '-o noatime'. And prints what is going on (-vvv).
 
 
 ENCRYPT AN USBSTICK
@@ -153,11 +153,11 @@ ENCRYPT AN USBSTICK
     could give the format action a mountpoint too. In this case your
     crypto-partition gets mounted on that mountpoint as well.
 
-*grml-crypt start /dev/external1 /mnt/tmp*::
+*grml-crypt start /dev/external1 /media/tmp*::
     Asks you for the right passphrase for your crypto-partition
-    and tries to mount it to /mnt/tmp.
+    and tries to mount it to /media/tmp.
 
-*grml-crypt stop /mnt/tmp*::
+*grml-crypt stop /media/tmp*::
     Removes your crypto-partition cleanly out of the system
     (umount, cryptsetup luksClose, [losetup -d]).
 
@@ -165,20 +165,20 @@ ENCRYPT AN USBSTICK
 ENCRYPTED LOOPFILESYSTEM ON USBSTICK
 ------------------------------------
 
-*mount /mnt/external1*::
-    Mounts your usb-stick on /mnt/external1 (please verify!).
+*mount /media/external1*::
+    Mounts your usb-stick on /media/external1 (please verify!).
 
-*grml-crypt -o -t vfat -s 50 format /mnt/external1/secure.img /mnt/tmp*::
+*grml-crypt -o -t vfat -s 50 format /media/external1/secure.img /media/tmp*::
     Creates a 50MB big file, encrypted with the default options
     and vfat (also known as fat32). The optimized initialisation mode will
     be used for this file (without -o this could take REALLY LONG).  This
-    command _also_ starts your cryptofile and mounts it on /mnt/tmp.
+    command _also_ starts your cryptofile and mounts it on /media/tmp.
 
-*grml-crypt stop /mnt/tmp*::
+*grml-crypt stop /media/tmp*::
     Removes your crypto-partition cleanly out of the system
     (umount, cryptsetup luksClose, [losetup -d]).
 
-*umount /mnt/external1*::
+*umount /media/external1*::
     Guess what? ;)