wok rev 2092
hal: use udevadmin so all devices are found --> cdrom automounting
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Wed Jan 28 18:53:57 2009 +0100 (2009-01-28) |
parents | 8f4ac32ab3b1 |
children | 2c6a67bd03cd |
files | hal/receipt hal/stuff/hal-udev.patch |
line diff
1.1 --- a/hal/receipt Wed Jan 28 16:41:23 2009 +0100 1.2 +++ b/hal/receipt Wed Jan 28 18:53:57 2009 +0100 1.3 @@ -27,6 +27,7 @@ 1.4 { 1.5 cd $src 1.6 zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids && 1.7 + patch -p1 < ../stuff/hal-udev.patch || exit 1 && 1.8 ./configure \ 1.9 --prefix=/usr \ 1.10 --libexecdir=/usr/lib/hal \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/hal/stuff/hal-udev.patch Wed Jan 28 18:53:57 2009 +0100 2.3 @@ -0,0 +1,29 @@ 2.4 +--- hal-0.5.11/hald/linux/blockdev.c 2008-05-08 01:23:41.000000000 +0200 2.5 ++++ hal-0.5.11.new/hald/linux/blockdev.c 2008-10-26 17:21:21.317075298 +0100 2.6 +@@ -1750,11 +1750,11 @@ 2.7 + char *ret; 2.8 + char *u_stdout; 2.9 + int u_exit_status; 2.10 +- const char *argv[] = {"/usr/bin/udevinfo", "--root", "--query", "name", "--path", NULL, NULL}; 2.11 ++ const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL}; 2.12 + GError *g_error; 2.13 + 2.14 + ret = NULL; 2.15 +- argv[5] = sysfs_path; 2.16 ++ argv[6] = sysfs_path; 2.17 + 2.18 + g_error = NULL; 2.19 + 2.20 +--- hal-0.5.11/hald/linux/coldplug.c 2008-05-08 01:23:32.000000000 +0200 2.21 ++++ hal-0.5.11.new/hald/linux/coldplug.c 2008-10-26 17:20:38.451808974 +0100 2.22 +@@ -149,8 +149,8 @@ 2.23 + static gboolean 2.24 + hal_util_init_sysfs_to_udev_map (void) 2.25 + { 2.26 +- char *udevdb_export_argv[] = { "/usr/bin/udevinfo", "-e", NULL }; 2.27 +- char *udevroot_argv[] = { "/usr/bin/udevinfo", "-r", NULL }; 2.28 ++ char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL }; 2.29 ++ char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL }; 2.30 + int udevinfo_exitcode; 2.31 + UdevInfo *info = NULL; 2.32 + char *p;