[Pkg-utopia-commits] r215 - in packages/sarge/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-06-08 19:04:04 +0000 (Wed, 08 Jun 2005)
New Revision: 215

Modified:
   packages/sarge/hal/debian/changelog
   packages/sarge/hal/debian/patches/hal-fdi.patch
   packages/sarge/hal/debian/preferences.fdi
Log:
Add changed that were done for 0.4.7-3sarge1

Modified: packages/sarge/hal/debian/changelog
===================================================================
--- packages/sarge/hal/debian/changelog	2005-06-08 19:01:22 UTC (rev 214)
+++ packages/sarge/hal/debian/changelog	2005-06-08 19:04:04 UTC (rev 215)
@@ -1,3 +1,11 @@
+hal (0.4.7-3sarge1) testing-proposed-updates; urgency=high
+
+  * Don't set the sync mount option by default on smaller drives (flash
+    drives). Especially on newer kernels this can wear out media too fast.
+    Warn against this in the example fdi file. (Closes: #309625)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 18 May 2005 23:03:39 +0200
+
 hal (0.4.7-3) unstable; urgency=low
 
   * Remove 50-fstab-sync.hal symlink from the package, it's not supposed to be

Modified: packages/sarge/hal/debian/patches/hal-fdi.patch
===================================================================
--- packages/sarge/hal/debian/patches/hal-fdi.patch	2005-06-08 19:01:22 UTC (rev 214)
+++ packages/sarge/hal/debian/patches/hal-fdi.patch	2005-06-08 19:04:04 UTC (rev 215)
@@ -1,11 +1,28 @@
-Index: hald/device_info.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/device_info.c,v
-retrieving revision 1.16
-diff -u -r1.16 device_info.c
---- hal/hald/device_info.c	14 Oct 2004 18:37:28 -0000	1.16
-+++ hal/hald/device_info.c	28 Oct 2004 18:57:31 -0000
-@@ -1176,7 +1176,10 @@
+diff -ruN hal-0.4.7-old/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi
+--- hal-0.4.7-old/fdi/90defaultpolicy/storage-policy.fdi	2005-01-20 18:03:57.000000000 +0100
++++ hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi	2005-05-18 23:03:18.000000000 +0200
+@@ -153,6 +153,9 @@
+ 
+ 	  <!-- Use noatime and sync options for all hotpluggable or removable
+ 	       volumes smaller than 2GB -->
++
++	 <!-- Mounting with sync wears out flash disk too much, thus disable it by
++	      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>
+@@ -163,6 +166,7 @@
+ 	      <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
+ 	    </match>
+ 	  </match>
++	  -->
+ 
+ 	  <!-- Use UTF-8 charset for vfat -->
+ 	  <match key="volume.fstype" string="vfat">
+diff -ruN hal-0.4.7-old/hald/device_info.c hal-0.4.7/hald/device_info.c
+--- hal-0.4.7-old/hald/device_info.c	2004-11-22 22:53:50.000000000 +0100
++++ hal-0.4.7/hald/device_info.c	2005-05-18 22:57:19.000000000 +0200
+@@ -1218,7 +1218,10 @@
  di_search_and_merge (HalDevice *d)
  {
  

Modified: packages/sarge/hal/debian/preferences.fdi
===================================================================
--- packages/sarge/hal/debian/preferences.fdi	2005-06-08 19:01:22 UTC (rev 214)
+++ packages/sarge/hal/debian/preferences.fdi	2005-06-08 19:04:04 UTC (rev 215)
@@ -23,8 +23,11 @@
 
 
 <!-- 
-  The following shows how to put sync and noatime on for devices smaller then 1Gb
-  and off for device lager then that.  Instead of the 2Gb default
+  The following shows how to put sync and noatime on for devices smaller then
+  1Gb and off for device larger then that. Note that the sync option can wear
+  out device faster then you'd like too. See
+  http://readlist.com/lists/vger.kernel.org/linux-kernel/22/111748.html for
+  more info.
 --> 
 <!--
   <device>