volume_id: use udev-provided log-level

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 5728be59e0d435c8107cfa803957cc971854ead8..3f76e98b2413e996ebcef1b02ad723e7d1a11b48 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -54,8 +54,10 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
-/* decide if we should manage the whole hotplug event
- * for now look if the kernel calls udevsend instead of /sbin/hotplug
+/* Decide if we should manage the whole uevent, including multiplexing
+ * of the hotplug directories.
+ * For now look if the kernel calls udevsend instead of /sbin/hotplug,
+ * or the uevent-helper in /proc/sys/kernel/hotplug is empty.
  */
 static int manage_hotplug_event(void) {
        char helper[256];
@@ -70,13 +72,15 @@ static int manage_hotplug_event(void) {
        if (fd < 0)
                return 0;
 
-       len = read(fd, helper, 256);
+       len = read(fd, helper, sizeof(helper)-1);
        close(fd);
 
        if (len < 0)
                return 0;
        helper[len] = '\0';
 
+       if (helper[0] == '\0' || helper[0] == '\n')
+               return 1;
        if (strstr(helper, "udevsend"))
                return 1;
 
@@ -148,7 +152,7 @@ int main(int argc, char *argv[], char *envp[])
                goto hotplug;
        }
 
-       /* export logging flag, as called scripts may want to do the same as udev */
+       /* export logging flag, as called programs may want to do the same as udev */
        if (udev_log_priority) {
                char priority[32];
 
@@ -204,6 +208,9 @@ int main(int argc, char *argv[], char *envp[])
                        retval = udev_remove_device(&udev);
                }
 
+               if (udev.devname[0] != '\0')
+                       setenv("DEVNAME", udev.devname, 1);
+
                if (udev_run && !list_empty(&udev.run_list)) {
                        struct name_entry *name_loop;
 
@@ -212,12 +219,6 @@ int main(int argc, char *argv[], char *envp[])
                                execute_command(name_loop->name, udev.subsystem);
                }
 
-               /* run dev.d/ scripts if we created/deleted a node or changed a netif name */
-               if (udev.devname[0] != '\0') {
-                       setenv("DEVNAME", udev.devname, 1);
-                       if (udev_dev_d)
-                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
-               }
        } else if (udev.type == DEV_DEVICE) {
                if (strcmp(action, "add") == 0) {
                        /* wait for sysfs */