wok-current annotate hal/stuff/hal-udev.patch @ rev 2811

libQtSvg update to 4.5.0
author Allan Pinto <allan316@gmail.com>
date Wed Apr 29 10:19:31 2009 +0000 (2009-04-29)
parents
children
rev   line source
pankso@2092 1 --- hal-0.5.11/hald/linux/blockdev.c 2008-05-08 01:23:41.000000000 +0200
pankso@2092 2 +++ hal-0.5.11.new/hald/linux/blockdev.c 2008-10-26 17:21:21.317075298 +0100
pankso@2092 3 @@ -1750,11 +1750,11 @@
pankso@2092 4 char *ret;
pankso@2092 5 char *u_stdout;
pankso@2092 6 int u_exit_status;
pankso@2092 7 - const char *argv[] = {"/usr/bin/udevinfo", "--root", "--query", "name", "--path", NULL, NULL};
pankso@2092 8 + const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
pankso@2092 9 GError *g_error;
pankso@2092 10
pankso@2092 11 ret = NULL;
pankso@2092 12 - argv[5] = sysfs_path;
pankso@2092 13 + argv[6] = sysfs_path;
pankso@2092 14
pankso@2092 15 g_error = NULL;
pankso@2092 16
pankso@2092 17 --- hal-0.5.11/hald/linux/coldplug.c 2008-05-08 01:23:32.000000000 +0200
pankso@2092 18 +++ hal-0.5.11.new/hald/linux/coldplug.c 2008-10-26 17:20:38.451808974 +0100
pankso@2092 19 @@ -149,8 +149,8 @@
pankso@2092 20 static gboolean
pankso@2092 21 hal_util_init_sysfs_to_udev_map (void)
pankso@2092 22 {
pankso@2092 23 - char *udevdb_export_argv[] = { "/usr/bin/udevinfo", "-e", NULL };
pankso@2092 24 - char *udevroot_argv[] = { "/usr/bin/udevinfo", "-r", NULL };
pankso@2092 25 + char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
pankso@2092 26 + char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
pankso@2092 27 int udevinfo_exitcode;
pankso@2092 28 UdevInfo *info = NULL;
pankso@2092 29 char *p;