hal: Branch 'master'

[David Zeuthen]

 tools/hal-luks-setup    |   14 +++++++-------
 tools/hal-luks-teardown |   14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
diff-tree 98454a5d597a3f96e3c683067ed9ca671b0b5b71 (from 542826d2851affabcda1b58dbb454c4004540550)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Apr 3 13:18:23 2007 -0400

    fix lock checking for LUKS setup/teardown
    
    Reported here
    
     http://lists.freedesktop.org/archives/hal/2007-April/007936.html

diff --git a/tools/hal-luks-setup b/tools/hal-luks-setup
index 154bde6..4e91d55 100755
--- a/tools/hal-luks-setup
+++ b/tools/hal-luks-setup
@@ -22,17 +22,17 @@ fi
 # Respect the same locks as Mount()/Unmount() etc.
 if [ -n "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME" ] ; then
     hal-is-caller-locked-out --udi $HAL_PROP_INFO_UDI \
-        --interface org.freedesktop.Hal.Volume \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+        --interface org.freedesktop.Hal.Device.Volume \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
-    hal-is-caller-locked-out --udi $HAL_PROP_STORAGE_ORIGINATING_DEVICE \
-        --interface org.freedesktop.Hal.Storage \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+    hal-is-caller-locked-out --udi $HAL_PROP_BLOCK_STORAGE_DEVICE \
+        --interface org.freedesktop.Hal.Device.Storage \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
 fi
diff --git a/tools/hal-luks-teardown b/tools/hal-luks-teardown
index 387cdfa..1c987d0 100755
--- a/tools/hal-luks-teardown
+++ b/tools/hal-luks-teardown
@@ -23,17 +23,17 @@ fi
 # Respect the same locks as Mount()/Unmount() etc.
 if [ -n "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME" ] ; then
     hal-is-caller-locked-out --udi $HAL_PROP_INFO_UDI \
-        --interface org.freedesktop.Hal.Volume \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+        --interface org.freedesktop.Hal.Device.Volume \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
-    hal-is-caller-locked-out --udi $HAL_PROP_STORAGE_ORIGINATING_DEVICE \
-        --interface org.freedesktop.Hal.Storage \
-        --caller $HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+    hal-is-caller-locked-out --udi $HAL_PROP_BLOCK_STORAGE_DEVICE \
+        --interface org.freedesktop.Hal.Device.Storage \
+        --caller "$HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME"
     RET=$?
-    if [ "$RET" != "1" ] ; then
+    if [ "$RET" != "0" ] ; then
         locked_out
     fi
 fi