SOURCES: hal-pld_policy.patch (NEW) - hal mount policy adaptation

[freetz]

Author: freetz                       Date: Sun Aug  7 19:53:47 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- hal mount policy adaptation

---- Files affected:
SOURCES:
   hal-pld_policy.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/hal-pld_policy.patch
diff -u /dev/null SOURCES/hal-pld_policy.patch:1.1
--- /dev/null	Sun Aug  7 21:53:47 2005
+++ SOURCES/hal-pld_policy.patch	Sun Aug  7 21:53:42 2005
@@ -0,0 +1,29 @@
+diff -aurN hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi
+--- hal-0.5.3.orig/fdi/policy/10osvendor/10-storage-policy.fdi	2005-05-13 20:41:20.000000000 +0200
++++ hal-0.5.3/fdi/policy/10osvendor/10-storage-policy.fdi	2005-08-04 22:04:05.000000000 +0200
+@@ -6,11 +6,11 @@
+   <device>
+     <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
+       <merge key="storage.policy.default.mount_root" type="string">/media</merge>
+-      <merge key="storage.policy.default.use_managed_keyword" type="bool">true</merge>
+-      <merge key="storage.policy.default.managed_keyword.primary" type="string">managed</merge>
+-      <merge key="storage.policy.default.managed_keyword.secondary" type="string">kudzu</merge>
++      <merge key="storage.policy.default.use_managed_keyword" type="bool">false</merge>
++      <merge key="storage.policy.default.managed_keyword.primary" type="string">comment=fstabsync</merge>
++      <merge key="storage.policy.default.managed_keyword.secondary" type="string">managed</merge>
+       <merge key="storage.policy.default.mount_option.noauto" type="bool">true</merge>
+-      <merge key="storage.policy.default.mount_option.pamconsole" type="bool">true</merge>
++      <merge key="storage.policy.default.mount_option.user" type="bool">true</merge>
+       <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
+     </match>
+   </device>
+@@ -96,6 +96,9 @@
+     <match key="block.is_volume" bool="true">
+       <match key="volume.fsusage" string="filesystem">
+ 	<!-- skip for drives with the no partitions hint (they are handled above) -->
++	<match key="@block.storage_device:storage.no_partitions_hint" bool="true">
++	    <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.policy.desired_mount_point</merge>
++	</match>
+ 	<match key="@block.storage_device:storage.no_partitions_hint" bool="false">
+ 
+ 	  <merge key="volume.policy.should_mount" type="bool">true</merge>
================================================================