[Pkg-utopia-commits] r997 - packages/unstable/hal/debian/patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-09-07 18:03:51 +0000 (Thu, 07 Sep 2006)
New Revision: 997

Modified:
   packages/unstable/hal/debian/patches/22_recognize_partitions.patch
Log:
Updated block_dev handler needs an update for the new is_partition semantics

Modified: packages/unstable/hal/debian/patches/22_recognize_partitions.patch
===================================================================
--- packages/unstable/hal/debian/patches/22_recognize_partitions.patch	2006-09-05 22:41:02 UTC (rev 996)
+++ packages/unstable/hal/debian/patches/22_recognize_partitions.patch	2006-09-07 18:03:51 UTC (rev 997)
@@ -1,6 +1,24 @@
 diff -Naur hal-0.5.7.1.vanilla/hald/linux2/blockdev.c hal-0.5.7.1/hald/linux2/blockdev.c
 --- hal-0.5.7.1.vanilla/hald/linux2/blockdev.c	2006-09-04 14:46:58.000000000 +0200
 +++ hal-0.5.7.1/hald/linux2/blockdev.c	2006-09-04 15:16:21.000000000 +0200
+@@ -679,7 +679,7 @@
+ 
+ 	hal_device_property_set_int (d, "block.major", major);
+ 	hal_device_property_set_int (d, "block.minor", minor);
+-	hal_device_property_set_bool (d, "block.is_volume", is_partition);
++	hal_device_property_set_bool (d, "block.is_volume", is_partition || is_fakevolume);
+ 
+ 	if (hal_device_has_property(parent, "info.bus") &&
+ 		(strcmp(hal_device_property_get_string(parent, "info.bus"), "platform") == 0) &&
+@@ -717,7 +717,7 @@
+ 		goto out2;
+ 	}
+ 
+-	if (!is_partition) {
++	if (!is_partition && !is_fakevolume) {
+ 		const char *udi_it;
+ 		const char *physdev_udi;
+ 		HalDevice *scsidev;
 @@ -1036,11 +1036,11 @@
  }