hal: Branch 'master'

[Danny Kukawka]

 fdi/policy/10osvendor/20-acl-management.fdi |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 0e94b8c9696cff21480b8f037356d7e9942cc477
Author: Ludwig Nussel <ludwig.nussel at suse.de>
Date:   Mon Jan 19 14:04:13 2009 +0100

    fix ACL handling for removable block devices (as CD/DVD)
    
    Fixed ACL handling for removable block devices (as CD/DVD). Do not set acl
    properties on unpartitioned volumes (bnc#408252), this change the settings
    for CD/DVD burn devices and prevent the user from burning CD/DVD's.

diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index 124d889..ee63768 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -31,9 +31,19 @@
     <!-- Removable block devices -->
     <match key="info.capabilities" contains="block">
       <match key="@block.storage_device:storage.removable" bool="true">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.file" type="copy_property">block.device</merge>
-        <merge key="access_control.type" type="string">removable-block</merge>
+        <!-- do not set acls on unpartitioned volumes, parent gets them -->
+        <match key="block.is_volume" bool="true"> 
+          <match key="volume.is_partition" bool="true"> 
+            <append key="info.capabilities" type="strlist">access_control</append>
+            <merge key="access_control.file" type="copy_property">block.device</merge>
+            <merge key="access_control.type" type="string">removable-block</merge>
+          </match>
+        </match>
+        <match key="block.is_volume" bool="false"> 
+          <append key="info.capabilities" type="strlist">access_control</append>
+          <merge key="access_control.file" type="copy_property">block.device</merge>
+          <merge key="access_control.type" type="string">removable-block</merge>
+        </match>
       </match>
     </match>