1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From: Danny Kukawka <danny.kukawka@web.de>
Date: Wed, 27 Aug 2008 19:24:33 +0000 (+0200)
Subject: use udevadm instead of (deprecated) udevinfo
X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=f6af40c1e7ea54e6
use udevadm instead of (deprecated) udevinfo
Use udevadm instead of (deprecated) udevinfo. Adapted/fixed version
of a patch contributed by Lucas Hazel <lucas@die.net.au> via HAL ML.
diff -Nur hal-0.5.11.orig/hald/linux/blockdev.c hal-0.5.11/hald/linux/blockdev.c
--- hal-0.5.11.orig/hald/linux/blockdev.c 2008-05-07 18:23:41.000000000 -0500
+++ hal-0.5.11/hald/linux/blockdev.c 2009-07-16 16:16:58.051983413 -0500
@@ -1750,7 +1750,7 @@
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;
diff -Nur hal-0.5.11.orig/hald/linux/coldplug.c hal-0.5.11/hald/linux/coldplug.c
--- hal-0.5.11.orig/hald/linux/coldplug.c 2008-05-07 18:23:32.000000000 -0500
+++ hal-0.5.11/hald/linux/coldplug.c 2009-07-16 16:16:58.051983413 -0500
@@ -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;
|
