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

diff --git a/mount-keys b/mount-keys
old mode 100644
new mode 100755
index e6ddb6d..dc344e5
--- a/mount-keys
+++ b/mount-keys
@@ -1,4 +1,6 @@
 #! /bin/sh
+sudo /etc/init.d/cfsd start || sudo /etc/init.d/cfsd restart || exit 1	# kludge
+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