[Pkg-utopia-commits] r285 - in packages/experimental/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-08-27 15:56:36 +0000 (Sat, 27 Aug 2005)
New Revision: 285

Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/patches/storage-policy-debian.patch
Log:
Sync debian/patches/storage-policy-debian.patch with ubuntu

Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2005-08-27 15:32:35 UTC (rev 284)
+++ packages/experimental/hal/debian/changelog	2005-08-27 15:56:36 UTC (rev 285)
@@ -7,12 +7,16 @@
     + Removed. Fixed upstream
   * Sync with ubuntu
     + Switched the init script to lsb-base
-    + hal.init.dbus: If hald does not want to die in do_stop, use the "yes, 
+    + hal.init.dbus: If hald does not want to die in do_stop, use the "yes,
       we really mean it" approach to ensure clean restarts.
+    + debian/patches/storage-policy-debian.patch
+      - Dropped noatime/sync handling hunk since upstream now does the right
+        thing.
+      - Enable storage.requires_eject on USB storage devices to always
+        eject them (which causes them to properly power off).
 
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 27 Aug 2005 17:55:22 +0200
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 27 Aug 2005 17:30:03 +0200
-
 hal (0.5.2-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/experimental/hal/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/experimental/hal/debian/patches/storage-policy-debian.patch	2005-08-27 15:32:35 UTC (rev 284)
+++ packages/experimental/hal/debian/patches/storage-policy-debian.patch	2005-08-27 15:56:36 UTC (rev 285)
@@ -1,6 +1,6 @@
-diff -ruN hal-0.5.2-old/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.2/fdi/policy/10osvendor/10-storage-policy.fdi
---- hal-0.5.2-old/fdi/policy/10osvendor/10-storage-policy.fdi	2005-05-09 16:32:08.000000000 +0200
-+++ hal-0.5.2/fdi/policy/10osvendor/10-storage-policy.fdi	2005-06-21 15:53:02.000000000 +0200
+diff -ruN hal-0.5.4-old/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi
+--- hal-0.5.4-old/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-08-27 17:55:01.000000000 +0200
 @@ -6,11 +6,11 @@
    <device>
      <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
@@ -47,23 +47,18 @@
  	<match key="@block.storage_device:storage.no_partitions_hint" bool="false">
  
  	  <merge key="volume.policy.should_mount" type="bool">true</merge>
-@@ -131,15 +147,15 @@
- 	    </match>
- 	  </match>
- 	  
--	  <!-- Use noatime and sync options for all hotpluggable or removable
--	       volumes smaller than 2GB -->
-+          <!-- Use noatime option for all hotpluggable or removable volumes
-+               smaller than 2GB; disable sync since it wears out flash devices -->
- 	  <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>
-+	      <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>
+@@ -195,5 +211,13 @@
+       <append key="info.addons" type="strlist">hald-addon-storage</append>
+     </match>
+   </device>
+-  
++
++  <!-- Always eject USB storage devices to properly power them off -->
++  <device>
++    <match key="info.category" string="storage">
++      <match key="storage.bus" string="usb">
++        <merge key="storage.requires_eject" type="bool">true</merge>
++      </match>
++    </match>
++  </device>
+ </deviceinfo>