udevd: clarify worker exit status

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

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 66bf62a24655ca725706b9fc8c21bf0831b31099..ef21ce8f6b1a5d774309226586fdbd49cf47c56b 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 = UDEV_EVENT_TIMEOUT_SEC * 1000 * 1000;
+       event->timeout_usec = 120 * 1000 * 1000;
        dbg(event->udev, "allocated event %p\n", event);
        return event;
 }
@@ -684,6 +684,9 @@ static int spawn_wait(struct udev_event *event, const char *cmd, pid_t pid)
                                        info(udev, "'%s'[%u] returned with exitcode %i\n", cmd, pid, WEXITSTATUS(status));
                                        if (WEXITSTATUS(status) != 0)
                                                err = -1;
+                               } else if (WIFSIGNALED(status)) {
+                                       err(udev, "'%s'[%u] terminated by signal %i\n", cmd, pid, WTERMSIG(status));
+                                       err = -1;
                                } else {
                                        err(udev, "'%s'[%u] unexpected exit with status 0x%04x\n", cmd, pid, status);
                                        err = -1;
@@ -830,7 +833,7 @@ static void rename_netif_kernel_log(struct ifreq ifr)
                return;
        }
 
-       fprintf(f, "<30>udev[%u]: renamed network interface %s to %s\n",
+       fprintf(f, "<30>udevd[%u]: renamed network interface %s to %s\n",
                getpid(), ifr.ifr_name, ifr.ifr_newname);
        fclose(f);
 }
@@ -868,7 +871,7 @@ static int rename_netif(struct udev_event *event)
                goto out;
 
        /* free our own name, another process may wait for us */
-       util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL);
+       snprintf(ifr.ifr_newname, IFNAMSIZ, "rename%u", udev_device_get_ifindex(dev));
        err = ioctl(sk, SIOCSIFNAME, &ifr);
        if (err < 0) {
                err = -errno;