summaryrefslogtreecommitdiffstats
path: root/package/hotplug2
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-04 08:04:16 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-04 08:04:16 +0000
commit1cc4a34061aa36b44a843e89ce618a3c08164d8d (patch)
tree0e81010020849707c879a4a75c7d0c00ee9911bc /package/hotplug2
parent73223b7f0972444bcfda1cc847c8bcab59181f50 (diff)
remove warning from hotplug2, which pops up 10 times during boot
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12086 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hotplug2')
-rw-r--r--package/hotplug2/patches/120-throttling.patch17
1 files changed, 10 insertions, 7 deletions
diff --git a/package/hotplug2/patches/120-throttling.patch b/package/hotplug2/patches/120-throttling.patch
index 8d67b0cbf..bfb7fb075 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