summaryrefslogtreecommitdiffstats
path: root/source/l/hal/patches/fix_md_crash.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2010-05-19 08:58:23 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:43:05 +0200
commitb76270bf9e6dd375e495fec92140a79a79415d27 (patch)
tree3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/l/hal/patches/fix_md_crash.diff
parent5a12e7c134274dba706667107d10d231517d3e05 (diff)
downloadcurrent-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz
current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.xz
Slackware 13.1slackware-13.1
Wed May 19 08:58:23 UTC 2010 Slackware 13.1 x86_64 stable is released! Lots of thanks are due -- see the RELEASE_NOTES and the rest of the ChangeLog for credits. The ISOs are on their way to replication, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We are taking pre-orders now at store.slackware.com, and offering a discount if you sign up for a subscription. Consider picking up a copy to help support the project. Thanks again to the Slackware community for testing, contributing, and generally holding us to a high level of quality. :-) Enjoy!
Diffstat (limited to 'source/l/hal/patches/fix_md_crash.diff')
-rw-r--r--source/l/hal/patches/fix_md_crash.diff45
1 files changed, 0 insertions, 45 deletions
diff --git a/source/l/hal/patches/fix_md_crash.diff b/source/l/hal/patches/fix_md_crash.diff
deleted file mode 100644
index 8a404c77f..000000000
--- a/source/l/hal/patches/fix_md_crash.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-Backported from b35bf1fbfc000749010a27f3f35a95ddf6bb0b07 Mon Sep 17 00:00:00 2001
-From: Chris Coulson <chrisccoulson@googlemail.com>
-Subject: fix crash when assembling certain MD devices
-
-Don't assume that the parent of a volume has storage capability; e. g.
-if we are an MD partition then this is the case as we were re-parented
-to the root computer device object earlier.
-
-FD#21603
-
---- a/hald/linux/blockdev.c 2008-05-08 01:23:41.000000000 +0200
-+++ b/hald/linux/blockdev.c 2009-06-04 12:48:31.000000000 +0200
-@@ -1392,10 +1392,15 @@ hotplug_event_begin_add_blockdev (const
- 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)
-@@ -1404,8 +1409,10 @@ hotplug_event_begin_add_blockdev (const
- 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");