Attachment 25568 Details for Bug 21603 – Patch which fixes the issue (don't assume that the parent has storage.drive_type property)

[patch] Patch which fixes the issue (don't assume that the parent has storage.drive_type property)

no_crash_on_md_blockdev.patch (text/plain), 1.86 KB, created by Chris Coulson on 2009-05-06 12:15:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Coulson

Created: 2009-05-06 12:15:07 UTC

Size: 1.86 KB

patch

obsolete

>Index: hal-0.5.12~rc1+git20090406.46dc48/hald/linux/blockdev.c
>===================================================================
>--- hal-0.5.12~rc1+git20090406.46dc48.orig/hald/linux/blockdev.c	2009-05-06 19:33:33.000000000 +0100
>+++ hal-0.5.12~rc1+git20090406.46dc48/hald/linux/blockdev.c	2009-05-06 19:53:43.000000000 +0100
>@@ -1498,8 +1498,15 @@
> 		hal_device_property_set_bool (d, "volume.is_mounted", FALSE);
> 		hal_device_property_set_bool (d, "volume.is_mounted_read_only", FALSE);
> 		hal_device_property_set_bool (d, "volume.linux.is_device_mapper", is_device_mapper);
>-		hal_device_property_set_bool (d, "volume.is_disc", strcmp (hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0);
>-
>+		/* Don't assume that the parent has storage capability, eg
>+		 * if we are an MD partition then this is the case as we were
>+		 * re-parented to the root computer device object earlier.
>+		 */
>+		if (hal_device_has_property(parent, "storage.drive_type")) {
>+			hal_device_property_set_bool (d, "volume.is_disc", strcmp (hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0);
>+		} else {
>+			hal_device_property_set_bool (d, "volume.is_disc", FALSE);
>+		}
> 
> 		is_physical_partition = TRUE;
> 		if (is_fakevolume || is_device_mapper)
>@@ -1508,8 +1515,10 @@
> 		hal_device_property_set_bool (d, "volume.is_partition", is_physical_partition);
> 
> 		hal_device_property_set_string (d, "info.category", "volume");
>-		if (strcmp(hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0) {
>-			hal_device_add_capability (d, "volume.disc");
>+		if (hal_device_has_property(parent, "storage.drive_type")) {
>+			if (strcmp(hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0) {
>+				hal_device_add_capability (d, "volume.disc");
>+			}
> 		}
> 		hal_device_add_capability (d, "volume");
> 		hal_device_add_capability (d, "block");

Actions: View | Splinter Review

Attachments on bug 21603: 25568

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.