hal: Branch 'master'

[Danny Kukawka]

 hald/linux/blockdev.c |    2 +-
 hald/linux/coldplug.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f6af40c1e7ea54e69eb2d259d91dd212065d5f6e
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Aug 27 21:24:33 2008 +0200

    use udevadm instead of (deprecated) udevinfo
    
    Use udevadm instead of (deprecated) udevinfo. Adapted/fixed version
    of a patch contributed by Lucas Hazel <lucas at die.net.au> via HAL ML.

diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
index 396dd9e..d1c9ee9 100644
--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -1770,7 +1770,7 @@ udev_get_device_file_for_sysfs_path (const char *sysfs_path)
         char *ret;
         char *u_stdout;
         int u_exit_status;
-        const char *argv[] = {"/usr/bin/udevinfo", "--root", "--query", "name", "--path", NULL, NULL};
+        const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
         GError *g_error;
 
         ret = NULL;
diff --git a/hald/linux/coldplug.c b/hald/linux/coldplug.c
index 1d10131..0ba7182 100644
--- a/hald/linux/coldplug.c
+++ b/hald/linux/coldplug.c
@@ -149,8 +149,8 @@ udev_info_to_hotplug_event (const UdevInfo *info)
 static gboolean
 hal_util_init_sysfs_to_udev_map (void)
 {
-	char *udevdb_export_argv[] = { "/usr/bin/udevinfo", "-e", NULL };
-	char *udevroot_argv[] = { "/usr/bin/udevinfo", "-r", NULL };
+	char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
+	char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
 	int udevinfo_exitcode;
 	UdevInfo *info = NULL;
 	char *p;