From 7757db1f859616171693ed9a54d1d16d3d5ed8e9 Mon Sep 17 00:00:00 2001 From: "kay.sievers@vrfy.org" Date: Thu, 25 Nov 2004 09:55:54 +0100 Subject: [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. --- udev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'udev.c') diff --git a/udev.c b/udev.c index 9b0a00fb..5ad7e425 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); } -- cgit 1.2.3-korg