diff options
author | John Crispin <john@openwrt.org> | 2008-08-04 08:04:16 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2008-08-04 08:04:16 +0000 |
commit | 863afccae82eba557fb26ac46deb7de9881b113b (patch) | |
tree | dd8d2dc74e04639672ee3cfcc79ce8a8d8a149b8 | |
parent | e3fb32cd02420a7b7cc3dc72d02c3b2f99a4e349 (diff) | |
download | upstream-863afccae82eba557fb26ac46deb7de9881b113b.tar.gz upstream-863afccae82eba557fb26ac46deb7de9881b113b.tar.bz2 upstream-863afccae82eba557fb26ac46deb7de9881b113b.zip |
remove warning from hotplug2, which pops up 10 times during boot
SVN-Revision: 12086
-rw-r--r-- | package/hotplug2/patches/120-throttling.patch | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/package/hotplug2/patches/120-throttling.patch b/package/hotplug2/patches/120-throttling.patch index 8d67b0cbf8..bfb7fb075e 100644 --- a/package/hotplug2/patches/120-throttling.patch +++ b/package/hotplug2/patches/120-throttling.patch @@ -1,5 +1,7 @@ ---- a/hotplug2.c -+++ b/hotplug2.c +Index: hotplug2-0.9/hotplug2.c +=================================================================== +--- hotplug2-0.9.orig/hotplug2.c 2008-08-04 10:02:27.000000000 +0200 ++++ hotplug2-0.9/hotplug2.c 2008-08-04 10:03:04.000000000 +0200 @@ -21,6 +21,7 @@ #include <sys/mman.h> #include <linux/types.h> @@ -29,7 +31,7 @@ if (netlink_socket == -1) { ERROR("netlink init","Unable to open netlink socket."); -@@ -642,20 +650,45 @@ +@@ -642,20 +650,44 @@ * Main loop reading uevents */ while (!terminate) { @@ -59,7 +61,6 @@ + msg_poll.revents = 0; + fds = poll(&msg_poll, 1, HOTPLUG2_THROTTLE_INTERVAL); + if (fds < 0) { -+ perror("POLL FAILED"); + continue; + } + if (fds == 0) @@ -87,7 +88,7 @@ } /* -@@ -706,13 +739,16 @@ +@@ -706,13 +738,16 @@ * Unless, of course, we've specified otherwise and no rules that match * need throttling. */ @@ -111,8 +112,10 @@ } sigemptyset(&block_mask); ---- a/hotplug2.h -+++ b/hotplug2.h +Index: hotplug2-0.9/hotplug2.h +=================================================================== +--- hotplug2-0.9.orig/hotplug2.h 2008-08-04 10:02:27.000000000 +0200 ++++ hotplug2-0.9/hotplug2.h 2008-08-04 10:02:27.000000000 +0200 @@ -45,9 +45,9 @@ #define DBG(action, fmt, arg...) #endif |