update to work with PolicyKit HEAD

5 files changed, 243 insertions, 273 deletions

diff --git a/policy/hal-device-file.policy b/policy/hal-device-file.policy
index e3289b40..d1318b63 100644
--- a/policy/hal-device-file.policy
+++ b/policy/hal-device-file.policy
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE policyconfig PUBLIC
  "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
@@ -11,87 +12,80 @@ HAL is licensed to you under your choice of the the Academic Free
 License Version 2.1, or the GNU General Public License version 2. Some
 individual source files may be under the GPL only. See COPYING for
 details.
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
 -->
 
 <policyconfig>
-  <group id="hal-device-file">
-    <description>Raw device access</description>
-
-    <policy id="hal-device-file-sound">
-      <description>Directly access sound devices</description>
-      <message>System policy prevents access to the sound devices</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-device-file-video4linux">
-      <description>Directly access video capture devices</description>
-      <message>System policy prevents access to video capture devices</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-device-file-cdrom">
-      <description>Directly access optical drives</description>
-      <message>System policy prevents access to optical drives</message>
-      <defaults>
-        <allow_inactive>yes</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-device-file-dvb">
-      <description>Directly access DVB devices</description>
-      <message>System policy prevents access to DVB devices</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-device-file-camera">
-      <description>Directly access digital cameras</description>
-      <message>System policy prevents access to digital cameras</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-device-file-scanner">
-      <description>Directly access scanners</description>
-      <message>System policy prevents access to scanners</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-device-file-ieee1394-iidc">
-      <description>Directly access Firewire IIDC devices</description>
-      <message>System policy prevents access to Firewire IIDC devices</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
 
-    <policy id="hal-device-file-ieee1394-avc">
-      <description>Directly access Firewire AVC devices</description>
-      <message>System policy prevents access to Firewire AVC devices</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
+  <action id="org.freedesktop.hal.device-access.sound">
+    <description>Directly access sound devices</description>
+    <message>System policy prevents access to the sound devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.device-access.video4linux">
+    <description>Directly access video capture devices</description>
+    <message>System policy prevents access to video capture devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.device-access.cdrom">
+    <description>Directly access optical drives</description>
+    <message>System policy prevents access to optical drives</message>
+    <defaults>
+      <allow_inactive>yes</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.device-access.dvb">
+    <description>Directly access DVB devices</description>
+    <message>System policy prevents access to DVB devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.device-access.camera">
+    <description>Directly access digital cameras</description>
+    <message>System policy prevents access to digital cameras</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.device-access.scanner">
+    <description>Directly access scanners</description>
+    <message>System policy prevents access to scanners</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.device-access.ieee1394-iidc">
+    <description>Directly access Firewire IIDC devices</description>
+    <message>System policy prevents access to Firewire IIDC devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.device-access.ieee1394-avc">
+    <description>Directly access Firewire AVC devices</description>
+    <message>System policy prevents access to Firewire AVC devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
 
-  </group>
 </policyconfig>
diff --git a/policy/hal-killswitch.policy b/policy/hal-killswitch.policy
index c658cdc3..dce0339d 100644
--- a/policy/hal-killswitch.policy
+++ b/policy/hal-killswitch.policy
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE policyconfig PUBLIC
  "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
@@ -11,33 +12,26 @@ HAL is licensed to you under your choice of the the Academic Free
 License Version 2.1, or the GNU General Public License version 2. Some
 individual source files may be under the GPL only. See COPYING for
 details.
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
 -->
 
 <policyconfig>
-  <group id="hal-killswitch">
-    <description>Radio Killswitches</description>
-
-    <policy id="hal-killswitch-bluetooth">
-      <description>Turn Bluetooth radio On/Off</description>
-      <message>System policy prevents turning the Bluetooth radio On/Off</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
 
-    <policy id="hal-killswitch-wlan">
-      <description>Turn WLAN radio On/Off</description>
-      <message>System policy prevents turning the WLAN radio On/Off</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
+  <action id="org.freedesktop.hal.killswitch.bluetooth">
+    <description>Turn Bluetooth radio On/Off</description>
+    <message>System policy prevents turning the Bluetooth radio On/Off</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.killswitch.wlan">
+    <description>Turn WLAN radio On/Off</description>
+    <message>System policy prevents turning the WLAN radio On/Off</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
 
-  </group>
 </policyconfig>
diff --git a/policy/hal-lock.policy b/policy/hal-lock.policy
index 161d30d4..6789a4a4 100644
--- a/policy/hal-lock.policy
+++ b/policy/hal-lock.policy
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE policyconfig PUBLIC
  "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
@@ -11,24 +12,17 @@ HAL is licensed to you under your choice of the the Academic Free
 License Version 2.1, or the GNU General Public License version 2. Some
 individual source files may be under the GPL only. See COPYING for
 details.
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
 -->
 
 <policyconfig>
-  <group id="hal-lock">
-    <description>Locking of devices</description>
 
-    <policy id="hal-lock">
-      <description>Acquire locks on devices</description>
-      <message>System policy prevents locking devices</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
+  <action id="org.freedesktop.hal.lock">
+    <description>Acquire locks on devices</description>
+    <message>System policy prevents locking devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
 
-  </group>
 </policyconfig>
diff --git a/policy/hal-power.policy b/policy/hal-power.policy
index ffc1a7f9..f0ee7fdf 100644
--- a/policy/hal-power.policy
+++ b/policy/hal-power.policy
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE policyconfig PUBLIC
  "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
@@ -11,114 +12,107 @@ HAL is licensed to you under your choice of the the Academic Free
 License Version 2.1, or the GNU General Public License version 2. Some
 individual source files may be under the GPL only. See COPYING for
 details.
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
 -->
 
 <policyconfig>
-  <group id="hal-power">
-    <description>Power Management</description>
-
-    <policy id="hal-power-shutdown">
-      <description>Shut down the system</description>
-      <message>System policy prevents shutting down the system</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-power-shutdown-multiple-sessions">
-      <description>Shut down the system when multiple users are logged in</description>
-      <message>System policy prevents shutting down the system while multiple users are logged in</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>auth_admin</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-power-reboot">
-      <description>Reboot the system</description>
-      <message>System policy prevents rebooting the system</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-power-reboot-multiple-sessions">
-      <description>Reboot the system when multiple users are logged in</description>
-      <message>System policy prevents rebooting the system while multiple users are logged in</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>auth_admin</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-power-set-powersave">
-      <description>Configure to system to prefer power savings</description>
-      <message>System policy prevents enabling power savings</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-power-suspend">
-      <description>Suspend the system</description>
-      <message>System policy prevents suspending the system</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-power-hibernate">
-      <description>Hibernate the system</description>
-      <message>System policy prevents hibernating the system</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-power-cpufreq">
-      <description>Configure CPU frequency scaling</description>
-      <message>System policy prevents CPU frequency scaling to be configured</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-power-lcd-panel">
-      <description>Set laptop panel brightness</description>
-      <message>System policy prevents adjusting the laptop panel brightness</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-power-light-sensor">
-      <description>Detect ambient light using light sensor</description>
-      <message>System policy prevents accessing the ambient light sensor</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
 
-    <policy id="hal-power-keyboard-backlight">
-      <description>Set keyboard backlight</description>
-      <message>System policy prevents adjusting the keyboard backlight</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
+  <action id="org.freedesktop.hal.power-management.shutdown">
+    <description>Shut down the system</description>
+    <message>System policy prevents shutting down the system</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.shutdown-multiple-sessions">
+    <description>Shut down the system when multiple users are logged in</description>
+    <message>System policy prevents shutting down the system while multiple users are logged in</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.reboot">
+    <description>Reboot the system</description>
+    <message>System policy prevents rebooting the system</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.reboot-multiple-sessions">
+    <description>Reboot the system when multiple users are logged in</description>
+    <message>System policy prevents rebooting the system while multiple users are logged in</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.set-powersave">
+    <description>Configure to system to prefer power savings</description>
+    <message>System policy prevents enabling power savings</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.suspend">
+    <description>Suspend the system</description>
+    <message>System policy prevents suspending the system</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.hibernate">
+    <description>Hibernate the system</description>
+    <message>System policy prevents hibernating the system</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.cpufreq">
+    <description>Configure CPU frequency scaling</description>
+    <message>System policy prevents CPU frequency scaling to be configured</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.lcd-panel">
+    <description>Set laptop panel brightness</description>
+    <message>System policy prevents adjusting the laptop panel brightness</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.light-sensor">
+    <description>Detect ambient light using light sensor</description>
+    <message>System policy prevents accessing the ambient light sensor</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.power-management.keyboard-backlight">
+    <description>Set keyboard backlight</description>
+    <message>System policy prevents adjusting the keyboard backlight</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
 
-  </group>
 </policyconfig>
diff --git a/policy/hal-storage.policy b/policy/hal-storage.policy
index 8f2e54c5..ff729c8d 100644
--- a/policy/hal-storage.policy
+++ b/policy/hal-storage.policy
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE policyconfig PUBLIC
  "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
@@ -11,60 +12,53 @@ HAL is licensed to you under your choice of the the Academic Free
 License Version 2.1, or the GNU General Public License version 2. Some
 individual source files may be under the GPL only. See COPYING for
 details.
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
 -->
 
 <policyconfig>
-  <group id="hal-storage">
-    <description>Storage Drives and Media</description>
-
-    <policy id="hal-storage-mount-fixed">
-      <description>Mount file systems from internal drives.</description>
-      <message>System policy prevents mounting internal media</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>auth_admin_keep_always</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-storage-mount-removable">
-      <description>Mount file systems from removable drives.</description>
-      <message>System policy prevents mounting removable media</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-storage-unmount-others">
-      <description>Unmount file systems mounted by other users.</description>
-      <message>System policy prevents unmounting media mounted by other users</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>auth_admin_keep_always</allow_active>
-      </defaults>
-    </policy>
-
-    <policy id="hal-storage-eject">
-      <description>Eject removable media.</description>
-      <message>System policy prevents ejecting removable media</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
 
-    <policy id="hal-storage-crypto-setup">
-      <description>Set up decryption for encrypted storage devices.</description>
-      <message>System policy prevents accessing encrypted storage devices</message>
-      <defaults>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </policy>
+  <action id="org.freedesktop.hal.storage.mount-fixed">
+    <description>Mount file systems from internal drives.</description>
+    <message>System policy prevents mounting internal media</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep_always</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.storage.mount-removable">
+    <description>Mount file systems from removable drives.</description>
+    <message>System policy prevents mounting removable media</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.storage.unmount-others">
+    <description>Unmount file systems mounted by other users.</description>
+    <message>System policy prevents unmounting media mounted by other users</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin_keep_always</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.storage.eject">
+    <description>Eject removable media.</description>
+    <message>System policy prevents ejecting removable media</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+  
+  <action id="org.freedesktop.hal.storage.crypto-setup">
+    <description>Set up decryption for encrypted storage devices.</description>
+    <message>System policy prevents accessing encrypted storage devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
 
-  </group>
 </policyconfig>