chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev_volume_id: fix endianess macros
[elogind.git]
/
udevstart.c
diff --git
a/udevstart.c
b/udevstart.c
index d41702efd17a4621199509ce4a1a207dc048404b..60e63c5ad8a69c8c9b512ff764e97c4d310895b2 100644
(file)
--- a/
udevstart.c
+++ b/
udevstart.c
@@
-126,6
+126,9
@@
static int add_device(const char *path, const char *subsystem)
udev_init_device(&udev, devpath, subsystem, "add");
udev_add_device(&udev, class_dev);
udev_init_device(&udev, devpath, subsystem, "add");
udev_add_device(&udev, class_dev);
+ if (udev.devname[0] != '\0')
+ setenv("DEVNAME", udev.devname, 1);
+
if (udev_run && !list_empty(&udev.run_list)) {
struct name_entry *name_loop;
if (udev_run && !list_empty(&udev.run_list)) {
struct name_entry *name_loop;
@@
-135,10
+138,8
@@
static int add_device(const char *path, const char *subsystem)
}
/* run dev.d/ scripts if we created a node or changed a netif name */
}
/* run dev.d/ scripts if we created a node or changed a netif name */
- if (udev_dev_d && udev.devname[0] != '\0') {
- setenv("DEVNAME", udev.devname, 1);
+ if (udev_dev_d && udev.devname[0] != '\0')
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
- }
sysfs_close_class_device(class_dev);
udev_cleanup_device(&udev);
sysfs_close_class_device(class_dev);
udev_cleanup_device(&udev);