# HG changeset patch # User Christophe Lincoln # Date 1233165237 -3600 # Node ID bbe071477efef1c01f83a01a1c918e98a3dad0ce # Parent 8f4ac32ab3b15b6a147e5416248c046877b6593b hal: use udevadmin so all devices are found --> cdrom automounting diff -r 8f4ac32ab3b1 -r bbe071477efe hal/receipt --- a/hal/receipt Wed Jan 28 16:41:23 2009 +0100 +++ b/hal/receipt Wed Jan 28 18:53:57 2009 +0100 @@ -27,6 +27,7 @@ { cd $src zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids && + patch -p1 < ../stuff/hal-udev.patch || exit 1 && ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/hal \ diff -r 8f4ac32ab3b1 -r bbe071477efe hal/stuff/hal-udev.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hal/stuff/hal-udev.patch Wed Jan 28 18:53:57 2009 +0100 @@ -0,0 +1,29 @@ +--- hal-0.5.11/hald/linux/blockdev.c 2008-05-08 01:23:41.000000000 +0200 ++++ hal-0.5.11.new/hald/linux/blockdev.c 2008-10-26 17:21:21.317075298 +0100 +@@ -1750,11 +1750,11 @@ + 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; + +--- hal-0.5.11/hald/linux/coldplug.c 2008-05-08 01:23:32.000000000 +0200 ++++ hal-0.5.11.new/hald/linux/coldplug.c 2008-10-26 17:20:38.451808974 +0100 +@@ -149,8 +149,8 @@ + 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;