SOURCES: hal-pld_policy.patch - back to fstab-sync managed solutio...

[freetz]

Author: freetz                       Date: Sun Sep  4 13:17:17 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- back to fstab-sync managed solution, do not create volumes with label's
  name (now all partitions should be listed)

---- Files affected:
SOURCES:
   hal-pld_policy.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/hal-pld_policy.patch
diff -u SOURCES/hal-pld_policy.patch:1.4 SOURCES/hal-pld_policy.patch:1.5
--- SOURCES/hal-pld_policy.patch:1.4	Sat Aug 27 23:30:40 2005
+++ SOURCES/hal-pld_policy.patch	Sun Sep  4 15:17:10 2005
@@ -1,16 +1,12 @@
-diff -urN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi
---- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi	2005-08-27 22:13:17.239258560 +0200
-+++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi	2005-08-27 22:29:24.738176368 +0200
-@@ -6,11 +6,11 @@
-   <device>
-     <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
+diff -aurN hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi
+--- hal-0.5.4.orig/fdi/policy/10osvendor/10-storage-policy.fdi	2005-05-23 16:06:27.000000000 +0200
++++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi	2005-09-04 15:10:20.000000000 +0200
+@@ -8,9 +8,9 @@
        <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.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.managed_keyword.secondary" type="string"></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>
@@ -80,7 +76,25 @@
  	<match key="@block.storage_device:storage.no_partitions_hint" bool="false">
  
  	  <merge key="volume.policy.should_mount" type="bool">true</merge>
-@@ -195,5 +211,14 @@
+@@ -111,17 +127,6 @@
+  	    <merge key="volume.policy.desired_mount_point" type="string">zip</merge>
+           </match>
+ 	  
+-          <!-- Best: If available use filesystem label -->
+-          <match key="volume.label" empty="false">
+-            <!-- unless it's a path (e.g. /boot, /, /home etc) -->
+-            <match key="volume.label" is_absolute_path="false">
+-	      <!-- and only if the label is ascii -->
+-              <match key="volume.label" is_ascii="true">
+-		<merge key="volume.policy.desired_mount_point" type="copy_property">volume.label</merge>
+-              </match>
+-            </match>
+-          </match>
+-	  
+ 	  <!-- Should never mount Apple Bootstrap partitions (it would be
+ 	       a security hole) - should use the bootable flag from the
+ 	       Mac partition table instead -->
+@@ -195,5 +200,14 @@
        <append key="info.addons" type="strlist">hald-addon-storage</append>
      </match>
    </device>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/hal-pld_policy.patch?r1=1.4&r2=1.5&f=u