From: Colin Watson <cjwatson@chiark.greenend.org.uk>
Date: Sat, 7 Sep 2002 16:40:26 +0000 (+0000)
Subject: Make CFS-handling scripts a bit safer (so multiple mount-keys invocations
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=commitdiff_plain;h=bc07ccaf217807534f57791dba1ac0a3243814e0

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 e6ddb6d..4e2d1d7 100644
--- 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 2177581..fa45b02 100644
--- 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