diff options
Diffstat (limited to 'udev-update.patch')
| -rw-r--r-- | udev-update.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/udev-update.patch b/udev-update.patch new file mode 100644 index 000000000000..f2ca5977a7ed --- /dev/null +++ b/udev-update.patch @@ -0,0 +1,55 @@ +diff -ur hal-0.5.14_origin/hald/linux/blockdev.c hal-0.5.14/hald/linux/blockdev.c +--- hal-0.5.14_origin/hald/linux/blockdev.c 2012-02-15 01:44:51.000000000 +0100 ++++ hal-0.5.14/hald/linux/blockdev.c 2012-02-15 01:45:12.000000000 +0100 +@@ -1864,7 +1864,7 @@ + char *ret; + char *u_stdout; + int u_exit_status; +- const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL}; ++ const char *argv[] = {"/usr/bin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL}; + GError *g_error; + + ret = NULL; +diff -ur hal-0.5.14_origin/hald/linux/coldplug.c hal-0.5.14/hald/linux/coldplug.c +--- hal-0.5.14_origin/hald/linux/coldplug.c 2012-02-15 01:44:51.000000000 +0100 ++++ hal-0.5.14/hald/linux/coldplug.c 2012-07-16 20:59:15.880478378 -0700 +@@ -154,8 +154,7 @@ + static gboolean + hal_util_init_sysfs_to_udev_map (void) + { +- char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL }; +- char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL }; ++ char *udevdb_export_argv[] = { "/usr/bin/udevadm", "info", "-e", NULL }; + int udevinfo_exitcode; + UdevInfo *info = NULL; + char *p; +@@ -163,26 +162,9 @@ + + sysfs_to_udev_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, udev_info_free); + +- /* get udevroot */ +- if (g_spawn_sync ("/", udevroot_argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN, NULL, NULL, +- &udevinfo_stdout, +- NULL, +- &udevinfo_exitcode, +- NULL) != TRUE) { +- HAL_ERROR (("Couldn't invoke %s", udevroot_argv[0])); +- goto error; +- } +- if (udevinfo_exitcode != 0) { +- HAL_ERROR (("%s returned %d", udevroot_argv[0], udevinfo_exitcode)); +- goto error; +- } +- +- g_strlcpy(dev_root, udevinfo_stdout, sizeof(dev_root)); +- p = strchr(dev_root, '\n'); +- if (p != NULL) +- p[0] = '\0'; +- g_free(udevinfo_stdout); +- HAL_INFO (("dev_root is %s", dev_root)); ++ /* get udevroot - hardcode to /dev to fix udevadm commit ++ * http://cgit.freedesktop.org/systemd/systemd/commit/?id=4f5d327a49e1a40ae0a3b8f1855dc90f3c0d953f */ ++ g_strlcpy(dev_root, "/dev", sizeof(dev_root)); + + /* get udevdb export */ + if (g_spawn_sync ("/", udevdb_export_argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN, NULL, NULL, |