rules: SUSE - move last distro rule to package

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

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 1be3f74ea382c54315652a818cb9762ee794a6f8..7591d5e314b3693fa55d903dbbf6582aef843147 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -38,10 +38,10 @@ 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->mode = 0660;
        dbg(event->udev, "allocated event %p\n", event);
        return event;
 }
@@ -111,7 +111,7 @@ size_t udev_event_apply_format(struct udev_event *event, const char *src, char *
        s = dest;
        l = size;
 
-       while (1) {
+       for (;;) {
                enum subst_type type = SUBST_UNKNOWN;
                char attrbuf[UTIL_PATH_SIZE];
                char *attr = NULL;
@@ -644,6 +644,10 @@ 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;
+
                        err = udev_node_add(dev, event->mode, event->uid, event->gid);
                }
 
@@ -677,7 +681,11 @@ 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 (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask) != 0) {
+                       if (event->exec_delay > 0) {
+                               info(event->udev, "delay execution of '%s'\n", program);
+                               sleep(event->exec_delay);
+                       }
+                       if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask, true) != 0) {
                                if (udev_list_entry_get_flags(list_entry))
                                        err = -1;
                        }