chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevd: always use udevd[] log prefix
[elogind.git]
/
udev
/
udev-event.c
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index 66bf62a24655ca725706b9fc8c21bf0831b31099..a8dfff48bf0a3ce646bf1a3419f7a70552ff44b2 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();
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;
}
dbg(event->udev, "allocated event %p\n", event);
return event;
}
@@
-830,7
+830,7
@@
static void rename_netif_kernel_log(struct ifreq ifr)
return;
}
return;
}
- fprintf(f, "<30>udev[%u]: renamed network interface %s to %s\n",
+ fprintf(f, "<30>udev
d
[%u]: renamed network interface %s to %s\n",
getpid(), ifr.ifr_name, ifr.ifr_newname);
fclose(f);
}
getpid(), ifr.ifr_name, ifr.ifr_newname);
fclose(f);
}
@@
-868,7
+868,7
@@
static int rename_netif(struct udev_event *event)
goto out;
/* free our own name, another process may wait for us */
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;
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err < 0) {
err = -errno;