diff options
| author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2004-11-12 06:21:16 +0100 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 22:25:09 -0700 |
| commit | 8673dcb84299fd2adba6281c5359bed4399d5b2d (patch) | |
| tree | 9db3b5d4e7218b098c53d62b8805c9c9368a78af /udevstart.c | |
| parent | af4b05d4917fdfa55eff3d8d53a830464d8162a1 (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 'udevstart.c')
| -rw-r--r-- | udevstart.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/udevstart.c b/udevstart.c index 0433e568d4..c1d877fb37 100644 --- a/udevstart.c +++ b/udevstart.c @@ -97,7 +97,8 @@ static int add_device(char *devpath, char *subsystem) setenv("DEVPATH", devpath, 1); setenv("SUBSYSTEM", subsystem, 1); - snprintf(path, SYSFS_PATH_MAX-1, "%s%s", sysfs_path, devpath); + snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath); + path[SYSFS_PATH_MAX-1] = '\0'; class_dev = sysfs_open_class_device_path(path); if (class_dev == NULL) { dbg ("sysfs_open_class_device_path failed"); @@ -107,8 +108,11 @@ static int add_device(char *devpath, char *subsystem) udev_set_values(&udev, devpath, subsystem, "add"); 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); |