keymap: Only run on key devices

[elogind.git] / udev / udev-event.c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 4af3e08f60e4c20727c7430b7e7cc18916a665ce..a4141e9c4b245d069390a68e8c8ccd38a4fbaaa6 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -43,13 +43,12 @@ struct udev_event *udev_event_new(struct udev_device *dev)
        event = calloc(1, sizeof(struct udev_event));
        if (event == NULL)
                return NULL;
-       event->mode = 0600;
        event->dev = dev;
        event->udev = udev_device_get_udev(dev);
        udev_list_init(&event->run_list);
        event->fd_signal = -1;
        event->birth_usec = now_usec();
-       event->timeout_usec = 120 * 1000 * 1000;
+       event->timeout_usec = 60 * 1000 * 1000;
        dbg(event->udev, "allocated event %p\n", event);
        return event;
 }
@@ -489,7 +488,7 @@ static int spawn_exec(struct udev_event *event,
 
        /* exec failed */
        err = -errno;
-       err(udev, "exec of program '%s' failed\n", cmd);
+       err(udev, "failed to execute '%s' '%s': %m\n", argv[0], cmd);
        return err;
 }
 
@@ -958,10 +957,6 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
                        if (err == 0) {
                                info(event->udev, "renamed netif to '%s'\n", event->name);
 
-                               /* delete stale db file */
-                               udev_device_delete_db(dev);
-                               udev_device_tag_index(dev, NULL, false);
-
                                /* remember old name */
                                udev_device_add_property(dev, "INTERFACE_OLD", udev_device_get_sysname(dev));
 
@@ -1021,9 +1016,18 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
                        if (event->dev_db != NULL)
                                udev_node_update_old_links(dev, event->dev_db);
 
-                       /* change default 0600 to 0660 if a group is assigned */
-                       if (event->mode == 0600 && event->gid > 0)
-                               event->mode = 0660;
+                       if (!event->mode_set) {
+                               if (udev_device_get_devnode_mode(dev) > 0) {
+                                       /* kernel supplied value */
+                                       event->mode = udev_device_get_devnode_mode(dev);
+                               } else if (event->gid > 0) {
+                                       /* default 0660 if a group is assigned */
+                                       event->mode = 0660;
+                               } else {
+                                       /* default 0600 */
+                                       event->mode = 0600;
+                               }
+                       }
 
                        err = udev_node_add(dev, event->mode, event->uid, event->gid);
                }
@@ -1075,7 +1079,7 @@ int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
                        udev_event_apply_format(event, cmd, program, sizeof(program));
                        envp = udev_device_get_properties_envp(event->dev);
                        if (udev_event_spawn(event, program, envp, sigmask, NULL, 0) < 0) {
-                               if (udev_list_entry_get_flags(list_entry))
+                               if (udev_list_entry_get_num(list_entry))
                                        err = -1;
                        }
                }