[Pkg-utopia-commits] r168 - in packages/hal/trunk/debian: . patches
Sjoerd Simons
sjoerd@costa.debian.org
Fri, 21 Jan 2005 17:30:12 +0100
Author: sjoerd
Date: 2005-01-21 17:30:11 +0100 (Fri, 21 Jan 2005)
New Revision: 168
Modified:
packages/hal/trunk/debian/changelog
packages/hal/trunk/debian/patches/storage-policy-debian.patch
Log:
Copy block.policy.desired_mount_point from block.storage to
volume.policy.desired_mount_point if the blockdevice has no partitions
(Closes: #290963)
Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog 2005-01-21 15:43:14 UTC (rev 167)
+++ packages/hal/trunk/debian/changelog 2005-01-21 16:30:11 UTC (rev 168)
@@ -4,8 +4,12 @@
+ Fixes various problems with vfat label detection (Closes: #271997)
* Enable building of fstab-sync as some people seem to like it
(Closes: #290780)
+ * debian/patches/storage-policy-debian.patch.
+ + Updated. Copy block.policy.desired_mount_point from block.storage to
+ volume.policy.desired_mount_point if the blockdevice has no partitions
+ (Closes: #290963)
- -- Sjoerd Simons <sjoerd@debian.org> Fri, 21 Jan 2005 16:39:39 +0100
+ -- Sjoerd Simons <sjoerd@debian.org> Fri, 21 Jan 2005 17:27:34 +0100
hal (0.4.5-1) unstable; urgency=low
Modified: packages/hal/trunk/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/hal/trunk/debian/patches/storage-policy-debian.patch 2005-01-21 15:43:14 UTC (rev 167)
+++ packages/hal/trunk/debian/patches/storage-policy-debian.patch 2005-01-21 16:30:11 UTC (rev 168)
@@ -1,6 +1,6 @@
-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-10-28 18:29:30.000000000 +0200
-+++ hal-0.4.1/fdi/90defaultpolicy/storage-policy.fdi 2004-11-26 20:27:15.014047321 +0100
+diff -ruN hal-0.4.6-old/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.6/fdi/90defaultpolicy/storage-policy.fdi
+--- hal-0.4.6-old/fdi/90defaultpolicy/storage-policy.fdi 2005-01-20 18:03:57.000000000 +0100
++++ hal-0.4.6/fdi/90defaultpolicy/storage-policy.fdi 2005-01-21 17:05:34.000000000 +0100
@@ -6,11 +6,11 @@
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
@@ -17,9 +17,19 @@
<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>
+@@ -105,6 +105,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>
+@@ -168,7 +171,17 @@
+ <match key="volume.fstype" string="vfat">
+ <merge key="volume.policy.mount_option.iocharset=utf8" type="bool">true</merge>
</match>
-
+