chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update SUSE rules
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index 25ef857a8cc177f5099836ce73b0972bfdc7db50..ff61c656c872c3d834efef79f6be1604136f9953 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-551,7
+551,7
@@
static struct uevent_msg *get_udevd_msg(void)
size = recvmsg(udevd_sock, &smsg, 0);
if (size < 0) {
if (errno != EINTR)
size = recvmsg(udevd_sock, &smsg, 0);
if (size < 0) {
if (errno != EINTR)
- err("unable to receive udevd message: %s", strerror(errno));
+ err("unable to receive u
ser u
devd message: %s", strerror(errno));
return NULL;
}
cmsg = CMSG_FIRSTHDR(&smsg);
return NULL;
}
cmsg = CMSG_FIRSTHDR(&smsg);
@@
-626,7
+626,7
@@
static struct uevent_msg *get_netlink_msg(void)
size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
if (size < 0) {
if (errno != EINTR)
size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
if (size < 0) {
if (errno != EINTR)
- err("unable to receive
udevd
message: %s", strerror(errno));
+ err("unable to receive
kernel netlink
message: %s", strerror(errno));
return NULL;
}
return NULL;
}
@@
-979,13
+979,8
@@
int main(int argc, char *argv[], char *envp[])
/* get user socket message */
if (FD_ISSET(udevd_sock, &readfds)) {
msg = get_udevd_msg();
/* get user socket message */
if (FD_ISSET(udevd_sock, &readfds)) {
msg = get_udevd_msg();
- if (msg) {
- if (msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) {
- info("skip non-kernel message with SEQNUM");
- free(msg);
- } else
- msg_queue_insert(msg);
- }
+ if (msg)
+ msg_queue_insert(msg);
}
/* get kernel netlink message */
}
/* get kernel netlink message */