[Pkg-utopia-commits] r303 - in packages/unstable/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-09-06 14:31:13 +0000 (Tue, 06 Sep 2005)
New Revision: 303

Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/patches/storage-policy-debian.patch
Log:
* debian/patches/storage-policy-debian.patch 
   + Actually mount small usb devices with noatime on and sync off 
     (Closes: #321727)


Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2005-09-06 08:45:20 UTC (rev 302)
+++ packages/unstable/hal/debian/changelog	2005-09-06 14:31:13 UTC (rev 303)
@@ -1,8 +1,11 @@
 hal (0.4.8-7) unstable; urgency=low
 
-  * Let libhal-dev depend on libpopt-dev (Closes: #322358) 
+  * Let libhal-dev depend on libpopt-dev (Closes: #322358)
+  * debian/patches/storage-policy-debian.patch
+    + Actually mount small usb devices with noatime on and sync off 
+      (Closes: #321727)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 14 Aug 2005 21:01:35 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue,  6 Sep 2005 16:28:51 +0200
 
 hal (0.4.8-6) unstable; urgency=low
 

Modified: packages/unstable/hal/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/unstable/hal/debian/patches/storage-policy-debian.patch	2005-09-06 08:45:20 UTC (rev 302)
+++ packages/unstable/hal/debian/patches/storage-policy-debian.patch	2005-09-06 14:31:13 UTC (rev 303)
@@ -1,6 +1,6 @@
 diff -ruN hal-0.4.8-old/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.8/fdi/90defaultpolicy/storage-policy.fdi
---- hal-0.4.8-old/fdi/90defaultpolicy/storage-policy.fdi	2005-08-07 21:56:24.000000000 +0200
-+++ hal-0.4.8/fdi/90defaultpolicy/storage-policy.fdi	2005-08-07 21:56:58.000000000 +0200
+--- hal-0.4.8-old/fdi/90defaultpolicy/storage-policy.fdi	2005-09-06 16:25:44.000000000 +0200
++++ hal-0.4.8/fdi/90defaultpolicy/storage-policy.fdi	2005-09-06 16:28:42.000000000 +0200
 @@ -6,11 +6,11 @@
    <device>
      <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
@@ -35,7 +35,7 @@
  	<match key="@block.storage_device:storage.no_partitions_hint" bool="false">
  
  	  <merge key="volume.policy.should_mount" type="bool">true</merge>
-@@ -164,6 +168,9 @@
+@@ -164,22 +168,41 @@
  
  	  <!-- Use noatime and sync options for all hotpluggable or removable
  	       volumes smaller than 2GB -->
@@ -44,35 +44,40 @@
 +	      default -->
  	  <match key="volume.size" compare_lt="2147483648">
  	    <match key="@block.storage_device:storage.hotpluggable" bool="true">
- 	      <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
-@@ -175,11 +182,28 @@
+-	      <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
++	      <merge key="volume.policy.mount_option.sync" type="bool">false</merge>
+ 	      <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
  	    </match>
+ 	    <match key="@block.storage_device:storage.removable" bool="true">
+-	      <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
++	      <merge key="volume.policy.mount_option.sync" type="bool">false</merge>
+ 	      <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>
  
 -	  <!-- Use UTF-8 charset for vfat -->
 +	  <!-- Use UTF-8 charset and the quiet option for vfat -->
  	  <match key="volume.fstype" string="vfat">
  	    <merge key="volume.policy.mount_option.iocharset=utf8" type="bool">true</merge>
 +	    <merge key="volume.policy.mount_option.quiet" type="bool">true</merge>
- 	  </match>
--	  
++	  </match>
 +	  <match key="volume.fstype" string="iso9660">
 +	    <merge key="volume.policy.mount_option.utf8" type="bool">true</merge>
 +	  </match>
 +	  <match key="volume.fstype" string="udf">
 +	    <merge key="volume.policy.mount_option.utf8" type="bool">true</merge>
-+	  </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>
+ 	  </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 -->