SOURCES: hal-pld_policy.patch - reverted last change (new partitio...

[freetz]

Author: freetz                       Date: Sat Sep 17 16:02:03 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverted last change (new partitions aren't fstab-synced with it),
  removed broken 'no partitions hint' handling (back to original)

---- Files affected:
SOURCES:
   hal-pld_policy.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/hal-pld_policy.patch
diff -u SOURCES/hal-pld_policy.patch:1.6 SOURCES/hal-pld_policy.patch:1.7
--- SOURCES/hal-pld_policy.patch:1.6	Tue Sep 13 17:48:25 2005
+++ SOURCES/hal-pld_policy.patch	Sat Sep 17 18:01:58 2005
@@ -1,6 +1,6 @@
 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
++++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi	2005-09-17 17:56:02.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>
@@ -66,17 +66,25 @@
  	</match>
        </match>
  
-@@ -96,6 +109,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>
-@@ -195,5 +200,14 @@
+@@ -111,17 +124,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 +197,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.6&r2=1.7&f=u