Make CFS-handling scripts a bit safer (so multiple mount-keys invocations

won't crash the machine).

diff --git a/mount-keys b/mount-keys
index e6ddb6d54f087528b69d89527e05bdb639087dd9..4e2d1d784032fe1a750e74cf01054dd12d49c597 100644 (file)
--- 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

diff --git a/umount-keys b/umount-keys
index 2177581abbd5b6b0e79ae4ae297b557e2dd2fbc2..fa45b0296e5e3810eef431f7fb4c3d4151262f6d 100644 (file)
--- a/umount-keys
+++ b/umount-keys
@@ -2,3 +2,4 @@
 cdetach cjwatson-keys
 sudo umount /mnt/usb/keys
 sudo losetup -d /dev/loop0
+sudo umount /mnt/usb