[Pkg-utopia-commits] r105 - in packages/hal/trunk/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-18 14:07:52 -0700 (Thu, 18 Nov 2004)
New Revision: 105

Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/patches/storage-policy-debian.patch
Log:
Change the default storage policy to work with nicely pmount

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-11-18 20:09:17 UTC (rev 104)
+++ packages/hal/trunk/debian/changelog	2004-11-18 21:07:52 UTC (rev 105)
@@ -8,6 +8,10 @@
     (Script from the ubuntu package)
   * Install udev configuration to make removable devices owned by group hal
     (Adapted from the ubuntu package)
+  * debian/README. Updated to reflect we run as user hal by default now.
+  * debian/patches/storage-policy-debian.patch.
+    + Updated. turn of sync and noatime for drivers bigger then 2GB. 
+    
 
  -- Sjoerd Simons <sjoerd@debian.org>  Mon,  8 Nov 2004 23:59:23 +0100
 

Modified: packages/hal/trunk/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/hal/trunk/debian/patches/storage-policy-debian.patch	2004-11-18 20:09:17 UTC (rev 104)
+++ packages/hal/trunk/debian/patches/storage-policy-debian.patch	2004-11-18 21:07:52 UTC (rev 105)
@@ -1,5 +1,6 @@
---- fdi/90defaultpolicy/storage-policy.fdi.orig	2004-11-04 20:51:03.000000000 +0100
-+++ fdi/90defaultpolicy/storage-policy.fdi	2004-11-04 21:20:09.000000000 +0100
+diff -Naur hal-0.4.1.orig/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.1/fdi/90defaultpolicy/storage-policy.fdi
+--- hal-0.4.1.orig/fdi/90defaultpolicy/storage-policy.fdi	2004-11-18 21:19:29.147300939 +0100
++++ hal-0.4.1/fdi/90defaultpolicy/storage-policy.fdi	2004-11-18 21:26:37.652116329 +0100
 @@ -7,10 +7,10 @@
      <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
        <merge key="storage.policy.default.mount_root" type="string">/media</merge>
@@ -14,3 +15,22 @@
        <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
      </match>
    </device>
+@@ -140,7 +140,17 @@
+ 	      <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
+ 	    </match>
+ 	  </match>
+-	  
++
++    <match key="volume.size" compare_ge="2147483648">
++      <match key="@block.storage_device:storage.hotpluggable" bool="true">
++        <merge key="volume.policy.mount_option.sync" type="bool">false</merge>
++        <merge key="volume.policy.mount_option.noatime" type="bool">false</merge>
++      </match>
++      <match key="@block.storage_device:storage.removable" bool="true">
++        <merge key="volume.policy.mount_option.sync" type="bool">false</merge>
++        <merge key="volume.policy.mount_option.noatime" type="bool">false</merge>
++      </match>
++    </match>
+ 	  <!-- whitelist of partition table id's, if from a msdos partition table -->
+ 	  <match key="volume.partition.msdos_part_table_type" exists="true">
+ 	    <!-- Default to no mount and punch holes -->