From 8673dcb84299fd2adba6281c5359bed4399d5b2d Mon Sep 17 00:00:00 2001 From: "kay.sievers@vrfy.org" Date: Fri, 12 Nov 2004 06:21:16 +0100 Subject: [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. --- udev.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'udev.c') diff --git a/udev.c b/udev.c index 300e85ce..bb3385e6 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: -- cgit 1.2.3-korg