udevd: improve error message in case exec() fails

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

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 4af3e08f60e4c20727c7430b7e7cc18916a665ce..4c51ed58e58ff33fb9cad7b02e2aca43966ea979 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *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 +489,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;
 }
 
@@ -1075,7 +1075,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;
                        }
                }