chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
034b37c
)
fix udevadm trigger
author
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 16 Sep 2008 23:32:42 +0000
(16:32 -0700)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Tue, 16 Sep 2008 23:32:42 +0000
(16:32 -0700)
udev/udevadm-trigger.c
patch
|
blob
|
history
diff --git
a/udev/udevadm-trigger.c
b/udev/udevadm-trigger.c
index 8a2c1256647976476a6ea3d4beb2fd2c01d5bdab..13736378df12ec80df18d440811cee95d3fd9064 100644
(file)
--- a/
udev/udevadm-trigger.c
+++ b/
udev/udevadm-trigger.c
@@
-47,7
+47,7
@@
static struct sockaddr_un saddr;
static socklen_t saddrlen;
/* devices that should run last cause of their dependencies */
static socklen_t saddrlen;
/* devices that should run last cause of their dependencies */
-static int delay_device(const char *
dev
path)
+static int delay_device(const char *
sys
path)
{
static const char *delay_device_list[] = {
"*/md*",
{
static const char *delay_device_list[] = {
"*/md*",
@@
-57,7
+57,7
@@
static int delay_device(const char *devpath)
int i;
for (i = 0; delay_device_list[i] != NULL; i++)
int i;
for (i = 0; delay_device_list[i] != NULL; i++)
- if (fnmatch(delay_device_list[i],
dev
path, 0) == 0)
+ if (fnmatch(delay_device_list[i],
sys
path, 0) == 0)
return 1;
return 0;
}
return 1;
return 0;
}
@@
-89,17
+89,16
@@
static int device_list_insert(struct udev *udev, const char *path)
return 0;
}
return 0;
}
-static void trigger_uevent(struct udev *udev, const char *
dev
path, const char *action)
+static void trigger_uevent(struct udev *udev, const char *
sys
path, const char *action)
{
char filename[UTIL_PATH_SIZE];
int fd;
{
char filename[UTIL_PATH_SIZE];
int fd;
- util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename));
- util_strlcat(filename, devpath, sizeof(filename));
+ util_strlcpy(filename, syspath, sizeof(filename));
util_strlcat(filename, "/uevent", sizeof(filename));
if (verbose)
util_strlcat(filename, "/uevent", sizeof(filename));
if (verbose)
- printf("%s\n",
dev
path);
+ printf("%s\n",
sys
path);
if (dry_run)
return;
if (dry_run)
return;
@@
-116,7
+115,7
@@
static void trigger_uevent(struct udev *udev, const char *devpath, const char *a
close(fd);
}
close(fd);
}
-static int pass_to_socket(struct udev *udev, const char *
dev
path, const char *action, const char *env)
+static int pass_to_socket(struct udev *udev, const char *
sys
path, const char *action, const char *env)
{
struct udevice *udevice;
struct name_entry *name_loop;
{
struct udevice *udevice;
struct name_entry *name_loop;
@@
-127,6
+126,7
@@
static int pass_to_socket(struct udev *udev, const char *devpath, const char *ac
int fd;
char link_target[UTIL_PATH_SIZE];
int len;
int fd;
char link_target[UTIL_PATH_SIZE];
int len;
+ const char *devpath = syspath[strlen(udev_get_sys_path(udev))];
int err = 0;
if (verbose)
int err = 0;
if (verbose)
@@
-191,8
+191,7
@@
static int pass_to_socket(struct udev *udev, const char *devpath, const char *ac
}
/* add keys from device "uevent" file */
}
/* add keys from device "uevent" file */
- util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
- util_strlcat(path, devpath, sizeof(path));
+ util_strlcpy(path, syspath, sizeof(path));
util_strlcat(path, "/uevent", sizeof(path));
fd = open(path, O_RDONLY);
if (fd >= 0) {
util_strlcat(path, "/uevent", sizeof(path));
fd = open(path, O_RDONLY);
if (fd >= 0) {