hal/tools hal-luks-setup,1.1,1.2

[David Zeuthen]

Update of /cvs/hal/hal/tools
In directory gabe:/tmp/cvs-serv12129/tools

Modified Files:
	hal-luks-setup 
Log Message:
2006-02-13  David Zeuthen  <davidz at redhat.com>

        * tools/hal-luks-setup: Refuse to setup the device if it's already
        setup once



Index: hal-luks-setup
===================================================================
RCS file: /cvs/hal/hal/tools/hal-luks-setup,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hal-luks-setup	13 Feb 2006 07:29:44 -0000	1.1
+++ hal-luks-setup	13 Feb 2006 07:49:18 -0000	1.2
@@ -23,6 +23,12 @@
 	exit 1
 fi
 
+if [ -e /dev/mapper/luks_crypto_$HAL_PROP_VOLUME_UUID ]; then
+	echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2
+	echo $HAL_PROP_BLOCK_DEVICE is already setup? >&2
+	exit 1
+fi
+
 if ! echo $password | $CRYPTSETUP luksOpen $HAL_PROP_BLOCK_DEVICE luks_crypto_$HAL_PROP_VOLUME_UUID  2> /dev/null; then
 	echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2
 	echo Error setting up $HAL_PROP_BLOCK_DEVICE - bad password? >&2