quick fix to ensure that ds_gdl_add is not called before it shouldHAL_0_2_2

1 files changed, 13 insertions, 2 deletions

diff --git a/hald/linux/linux_class_block.c b/hald/linux/linux_class_block.c
index 581e3ab1..e8fe4c32 100644
--- a/hald/linux/linux_class_block.c
+++ b/hald/linux/linux_class_block.c
@@ -380,9 +380,20 @@ void linux_class_block_check_if_ready_to_add(HalDevice* d)
     device_file = ds_property_get_string(d, "block.device");
     HAL_INFO(("Entering, udi=%s, device_file=%s", d->udi, device_file));
 
-    if( device_file!=NULL && strcmp(device_file, "")!=0 )
+    if( !is_probing )
     {
-        ds_gdl_add(d);
+        /** We really need to invoke udev soon */
+        if( device_file!=NULL && strcmp(device_file, "fixme-invoke-udev")!=0 )
+        {
+            ds_gdl_add(d);
+        }
+    }
+    else
+    {
+        if( device_file!=NULL && strcmp(device_file, "")!=0 )
+        {
+            ds_gdl_add(d);
+        }
     }
 }