Must have been a typo by Kay, changed from VOLUME_ID_DISKLABEL to

    VOLUME_ID_FILESYSTEM.
Remember to init the DBusError since some operations may fail. (main): Look
    at $HALD_ACTION for add, remove instead of first positional parameter
    $1.
New file
New file
New files (imported from hal-0.4.x)
Add rules for hald-probe-storage and hald-probe-volume
New file
Add rules for hald-addon-storage
New function (sigio_iochn_data): New function (osspec_init): Set up signal
    handler for SIGIO and the neccesary pipes to handle it safely. Set up
    directory watcher for /etc and invoke blockdev_mtab_changed whenever
    that happens
Call blockdev_* if appropriate
Add some new prototype for interacting with hotplug.c (much like what
    physdev.h and classdev.h) exported. Also add the prototype for a new
    function blockdev_mtab_changed.
Actually put some code here (the previous code was just boiler plate).
Add boolean already_issued_ callback
Truncate whitespace from string read (hal_util_terminate_helper): Don't
    remove the child watcher source, but set a flag that we already did the
    callback and helper_child_exited will reap the child (including
    removing sources). This helps reap the zombies I've been seeing.
    (helper_child_timeout): -do- (helper_child_exited): Only do callback if
    we haven't already done so.
Another nice script for running gdb on hald; just run this script and
    invoke the run command from the gdb console.
Also export ../tools so we can get fstab-sync going. Set HAL_FDI_SOURCE
Respect the env var HAL_FDI_SOURCE which is useful for development as hald
    will read you local .fdi files
Temporarily add fstab-sync add/rem callouts (mental note: move to other
    file soon); also add the media detection addon
New file
Add power-mgmt-policy.fdi

1 files changed, 14 insertions, 2 deletions

diff --git a/hald/device_info.c b/hald/device_info.c
index 730ced88..f1061bf9 100644
--- a/hald/device_info.c
+++ b/hald/device_info.c
@@ -1399,7 +1399,6 @@ scan_fdi_files (const char *dir, HalDevice * d)
 	return found_fdi_file;
 }
 
-
 /** Search the device info file repository for a .fdi file to merge
  *  more information into the device object.
  *
@@ -1409,8 +1408,21 @@ scan_fdi_files (const char *dir, HalDevice * d)
 dbus_bool_t
 di_search_and_merge (HalDevice *d)
 {
+	static gboolean have_checked_hal_fdi_source = FALSE;
+	static char *hal_fdi_source = NULL;
+	char *source;
+
+	if (!have_checked_hal_fdi_source) {
+		hal_fdi_source = getenv ("HAL_FDI_SOURCE");
+		have_checked_hal_fdi_source = TRUE;
+	}
+
+	if (hal_fdi_source != NULL)
+		source = hal_fdi_source;
+	else
+		source = PACKAGE_DATA_DIR "/hal/fdi";
 
-	return scan_fdi_files (PACKAGE_DATA_DIR "/hal/fdi", d);
+	return scan_fdi_files (source, d);
 }
 
 /** @} */