summaryrefslogtreecommitdiff
path: root/udev.c
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-11-25 09:55:54 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 22:47:02 -0700
commit7757db1f859616171693ed9a54d1d16d3d5ed8e9 (patch)
treeb85e4e2ab01e5b5df3d06bb7e1477c0f2298e27f /udev.c
parent9aa0485c97d1b02a39550e3be31c37520a0d0620 (diff)
[PATCH] don't call dev.d/ scripts twice, if directory = subsystem
The /etc/dev.d/input/input.dev was called twice for /dev/input/mouse. Skip the execution if we get a directory named after the subsystem. Move UDEV_NO_DEVD where it belongs.
Diffstat (limited to 'udev.c')
-rw-r--r--udev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/udev.c b/udev.c
index 9b0a00fb78..5ad7e425e6 100644
--- a/udev.c
+++ b/udev.c
@@ -180,7 +180,7 @@ int main(int argc, char *argv[], char *envp[])
retval = udev_add_device(&udev, class_dev);
/* run dev.d/ scripts if we created a node or changed a netif name */
- if (udev.devname[0] != '\0') {
+ if (udev_dev_d && udev.devname[0] != '\0') {
setenv("DEVNAME", udev.devname, 1);
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
}
@@ -198,7 +198,7 @@ int main(int argc, char *argv[], char *envp[])
setenv("DEVNAME", udev.devname, 1);
}
/* run dev.d/ scripts if we're not instructed to ignore the event */
- if (udev.devname[0] != '\0') {
+ if (udev_dev_d && udev.devname[0] != '\0') {
setenv("DEVNAME", udev.devname, 1);
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
}