X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=mount-keys;h=4e2d1d784032fe1a750e74cf01054dd12d49c597;hp=e6ddb6d54f087528b69d89527e05bdb639087dd9;hb=008357a5011fe968dcdcebc9ce15758651ac0bda;hpb=4967fa5c4efc606243803b8bb365d5871b72e155

diff --git a/mount-keys b/mount-keys
old mode 100644
new mode 100755
index e6ddb6d..4e2d1d7
--- a/mount-keys
+++ b/mount-keys
@@ -1,4 +1,5 @@
 #! /bin/sh
+grep -q '/mnt/usb ' /proc/mounts || sudo mount /mnt/usb
 sudo losetup /dev/loop0 /mnt/usb/cjwatson
-sudo mount -t ext2 /dev/loop0 /mnt/usb/keys
-cattach /mnt/usb/keys/keys cjwatson-keys
+grep -q '/mnt/usb/keys ' /proc/mounts || sudo mount -t ext2 /dev/loop0 /mnt/usb/keys
+[ -d /crypt/cjwatson-keys ] || cattach /mnt/usb/keys/keys cjwatson-keys