summaryrefslogtreecommitdiff
path: root/udev.c
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-11-12 06:21:16 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 22:25:09 -0700
commit8673dcb84299fd2adba6281c5359bed4399d5b2d (patch)
tree9db3b5d4e7218b098c53d62b8805c9c9368a78af /udev.c
parentaf4b05d4917fdfa55eff3d8d53a830464d8162a1 (diff)
[PATCH] Make dev.d/ handling a separate processing stage
Move the logic when and how to call the dev.d/ scripts into the main processing path.
Diffstat (limited to 'udev.c')
-rw-r--r--udev.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/udev.c b/udev.c
index 300e85ceb0..bb3385e67d 100644
--- a/udev.c
+++ b/udev.c
@@ -165,8 +165,11 @@ int main(int argc, char *argv[], char *envp[])
/* name, create node, store in db */
retval = udev_add_device(&udev, class_dev);
- /* run scripts */
- dev_d_execute(&udev);
+ /* run dev.d/ scripts if we created a node or changed a netif name */
+ if (udev.devname[0] != '\0') {
+ setenv("DEVNAME", udev.devname, 1);
+ dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+ }
sysfs_close_class_device(class_dev);
break;
@@ -177,7 +180,7 @@ int main(int argc, char *argv[], char *envp[])
retval = udev_remove_device(&udev);
/* run scripts */
- dev_d_execute(&udev);
+ dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
}
exit: