hal/tools hal-system-power-hibernate, 1.9, 1.10 hal-system-power-reboot, 1.5, 1.6 hal-system-power-shutdown, 1.5, 1.6 hal-system-power-suspend, 1.9, 1.10 hal-system-storage-eject, 1.9, 1.10 hal-system-storage-unmount, 1.10, 1.11

[David Zeuthen]

Update of /cvs/hal/hal/tools
In directory kemper:/tmp/cvs-serv26016/tools

Modified Files:
	hal-system-power-hibernate hal-system-power-reboot 
	hal-system-power-shutdown hal-system-power-suspend 
	hal-system-storage-eject hal-system-storage-unmount 
Log Message:
2006-03-26  David Zeuthen  <davidz at redhat.com>

        * tools/hal-system-power-hibernate,
          tools/hal-system-power-suspend,
          tools/hal-system-power-reboot,
          tools/hal-system-power-shutdown,
          tools/hal-system-storage-eject,
          tools/hal-system-storage-unmount: s/--policy/--privilege/ and
        s/--uid/--user/



Index: hal-system-power-hibernate
===================================================================
RCS file: /cvs/hal/hal/tools/hal-system-power-hibernate,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hal-system-power-hibernate	14 Mar 2006 06:43:50 -0000	1.9
+++ hal-system-power-hibernate	26 Mar 2006 20:13:03 -0000	1.10
@@ -12,7 +12,7 @@
 
 POLICY=hal-power-hibernate
 if [ "$HAL_METHOD_INVOKED_BY_UID" != "0" ] ; then
-    polkit-is-privileged --policy $POLICY --uid $HAL_METHOD_INVOKED_BY_UID
+    polkit-is-privileged --privilege $POLICY --user $HAL_METHOD_INVOKED_BY_UID
     IS_PRIVILEGED=$?
     if [ "$IS_PRIVILEGED" != "0" ] ; then
 	echo org.freedesktop.Hal.Device.PermissionDeniedByPolicy >&2

Index: hal-system-power-reboot
===================================================================
RCS file: /cvs/hal/hal/tools/hal-system-power-reboot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hal-system-power-reboot	14 Mar 2006 06:43:50 -0000	1.5
+++ hal-system-power-reboot	26 Mar 2006 20:13:03 -0000	1.6
@@ -8,7 +8,7 @@
 
 POLICY=hal-power-reboot
 if [ "$HAL_METHOD_INVOKED_BY_UID" != "0" ] ; then
-    polkit-is-privileged --policy $POLICY --uid $HAL_METHOD_INVOKED_BY_UID
+    polkit-is-privileged --privilege $POLICY --user $HAL_METHOD_INVOKED_BY_UID
     IS_PRIVILEGED=$?
     if [ "$IS_PRIVILEGED" != "0" ] ; then
 	echo org.freedesktop.Hal.Device.PermissionDeniedByPolicy >&2

Index: hal-system-power-shutdown
===================================================================
RCS file: /cvs/hal/hal/tools/hal-system-power-shutdown,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hal-system-power-shutdown	14 Mar 2006 06:43:50 -0000	1.5
+++ hal-system-power-shutdown	26 Mar 2006 20:13:03 -0000	1.6
@@ -8,7 +8,7 @@
 
 POLICY=hal-power-poweroff
 if [ "$HAL_METHOD_INVOKED_BY_UID" != "0" ] ; then
-    polkit-is-privileged --policy $POLICY --uid $HAL_METHOD_INVOKED_BY_UID
+    polkit-is-privileged --privilege $POLICY --user $HAL_METHOD_INVOKED_BY_UID
     IS_PRIVILEGED=$?
     if [ "$IS_PRIVILEGED" != "0" ] ; then
 	echo org.freedesktop.Hal.Device.PermissionDeniedByPolicy >&2

Index: hal-system-power-suspend
===================================================================
RCS file: /cvs/hal/hal/tools/hal-system-power-suspend,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hal-system-power-suspend	14 Mar 2006 06:43:50 -0000	1.9
+++ hal-system-power-suspend	26 Mar 2006 20:13:03 -0000	1.10
@@ -18,7 +18,7 @@
 
 POLICY=hal-power-suspend
 if [ "$HAL_METHOD_INVOKED_BY_UID" != "0" ] ; then
-    polkit-is-privileged --policy $POLICY --uid $HAL_METHOD_INVOKED_BY_UID
+    polkit-is-privileged --privilege $POLICY --user $HAL_METHOD_INVOKED_BY_UID
     IS_PRIVILEGED=$?
     if [ "$IS_PRIVILEGED" != "0" ] ; then
 	echo org.freedesktop.Hal.Device.PermissionDeniedByPolicy >&2

Index: hal-system-storage-eject
===================================================================
RCS file: /cvs/hal/hal/tools/hal-system-storage-eject,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hal-system-storage-eject	14 Mar 2006 06:43:50 -0000	1.9
+++ hal-system-storage-eject	26 Mar 2006 20:13:03 -0000	1.10
@@ -26,7 +26,7 @@
 # TODO: need to select storage-[fixed|removable][-change-uid]
 #POLICY=hal-storage-fixed-mount
 #if [ "$HAL_METHOD_INVOKED_BY_UID" != "0" ] ; then
-#    polkit-is-privileged --policy $POLICY --uid $HAL_METHOD_INVOKED_BY_UID
+#    polkit-is-privileged --privilege $POLICY --user $HAL_METHOD_INVOKED_BY_UID
 #    IS_PRIVILEGED=$?
 #    if [ "$IS_PRIVILEGED" != "0" ] ; then
 #	echo org.freedesktop.Hal.Device.PermissionDeniedByPolicy >&2

Index: hal-system-storage-unmount
===================================================================
RCS file: /cvs/hal/hal/tools/hal-system-storage-unmount,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hal-system-storage-unmount	14 Mar 2006 06:43:50 -0000	1.10
+++ hal-system-storage-unmount	26 Mar 2006 20:13:03 -0000	1.11
@@ -46,7 +46,7 @@
 # TODO: need to select storage-[fixed|removable][-change-uid]
 #POLICY=hal-storage-fixed-mount
 #if [ "$HAL_METHOD_INVOKED_BY_UID" != "0" ] ; then
-#    polkit-is-privileged --policy $POLICY --uid $HAL_METHOD_INVOKED_BY_UID
+#    polkit-is-privileged --privilege $POLICY --user $HAL_METHOD_INVOKED_BY_UID
 #    IS_PRIVILEGED=$?
 #    if [ "$IS_PRIVILEGED" != "0" ] ; then
 #	echo org.freedesktop.Hal.Device.PermissionDeniedByPolicy >&2