Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > a120bdfd96aa6e80daa87e083b3fbed5 > files > 5

hal-0.5.11-7mdv2009.0.src.rpm

diff -p -up hal-0.5.11/hald/linux/blockdev.c.udevadm hal-0.5.11/hald/linux/blockdev.c
--- hal-0.5.11/hald/linux/blockdev.c.udevadm	2008-09-09 18:42:26.000000000 +0200
+++ hal-0.5.11/hald/linux/blockdev.c	2008-09-09 18:45:38.000000000 +0200
@@ -1758,11 +1758,11 @@ udev_get_device_file_for_sysfs_path (con
         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;
-        argv[5] = sysfs_path;
+        argv[6] = sysfs_path;
 
         g_error = NULL;
 
diff -p -up hal-0.5.11/hald/linux/coldplug.c.udevadm hal-0.5.11/hald/linux/coldplug.c
--- hal-0.5.11/hald/linux/coldplug.c.udevadm	2008-09-09 18:42:26.000000000 +0200
+++ hal-0.5.11/hald/linux/coldplug.c	2008-09-09 18:42:26.000000000 +0200
@@ -149,8 +149,8 @@ udev_info_to_hotplug_event (const UdevIn
 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;