X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=60e63c5ad8a69c8c9b512ff764e97c4d310895b2;hp=a862dadf88c2818a365ef9b7a1ed860d4e5f6df9;hb=5165d1dcb71899aca01783e9edc4ad11528acab9;hpb=6b493a20e1dbf90a4e54d3be37027fa906220c31 diff --git a/udevstart.c b/udevstart.c index a862dadf8..60e63c5ad 100644 --- a/udevstart.c +++ b/udevstart.c @@ -123,15 +123,24 @@ static int add_device(const char *path, const char *subsystem) return -ENODEV; } - udev_init_device(&udev, devpath, subsystem); + udev_init_device(&udev, devpath, subsystem, "add"); udev_add_device(&udev, class_dev); - /* run dev.d/ scripts if we created a node or changed a netif name */ - if (udev_dev_d && udev.devname[0] != '\0') { + if (udev.devname[0] != '\0') setenv("DEVNAME", udev.devname, 1); - udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX); + + if (udev_run && !list_empty(&udev.run_list)) { + struct name_entry *name_loop; + + dbg("executing run list"); + list_for_each_entry(name_loop, &udev.run_list, node) + execute_command(name_loop->name, udev.subsystem); } + /* run dev.d/ scripts if we created a node or changed a netif name */ + if (udev_dev_d && udev.devname[0] != '\0') + udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX); + sysfs_close_class_device(class_dev); udev_cleanup_device(&udev);