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

[David Zeuthen]

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

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

        * tools/hal-luks-teardown: Remove hal-luks-remove on
        info.callouts.remove on successful teardown

        * tools/hal-luks-setup: Throw SetupPasswordError instead of just
        SetupError when cryptsetup is failing - used to ask for password
        again if the one from e.g. the keyring didn't work.

        * hald/hald_dbus.c (device_string_list_remove): New function
        (hald_dbus_filter_handle_methods): Handle StringListRemove



Index: hal-luks-setup
===================================================================
RCS file: /cvs/hal/hal/tools/hal-luks-setup,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hal-luks-setup	13 Feb 2006 07:49:18 -0000	1.2
+++ hal-luks-setup	14 Feb 2006 02:52:44 -0000	1.3
@@ -30,7 +30,7 @@
 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 org.freedesktop.Hal.Device.Volume.Crypto.SetupPasswordError >&2
 	echo Error setting up $HAL_PROP_BLOCK_DEVICE - bad password? >&2
 	exit 1
 fi

Index: hal-luks-teardown
===================================================================
RCS file: /cvs/hal/hal/tools/hal-luks-teardown,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hal-luks-teardown	13 Feb 2006 07:29:44 -0000	1.1
+++ hal-luks-teardown	14 Feb 2006 02:52:44 -0000	1.2
@@ -26,3 +26,5 @@
 	echo Error tearing down $HAL_PROP_BLOCK_DEVICE - fs still mounted? >&2
 	exit 1
 fi
+
+hal-set-property --udi=$UDI --key="info.callouts.remove" --strlist-rem="hal-luks-remove" > /dev/null 2>&1