summaryrefslogtreecommitdiffstats
path: root/package/hotplug2/patches/140-worker_fork_fix.patch
diff options
context:
space:
mode:
authoracinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-03 18:29:37 +0000
committeracinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-03 18:29:37 +0000
commitf0469e585740ca001dfed50af3b29cd6fad89286 (patch)
tree664b262fdbb412d431031091b7acfebdca9340f8 /package/hotplug2/patches/140-worker_fork_fix.patch
parent6c5b5ef769aebfab285f0490b748d35855899a26 (diff)
[package] hotplug2: Refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20685 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hotplug2/patches/140-worker_fork_fix.patch')
-rw-r--r--package/hotplug2/patches/140-worker_fork_fix.patch23
1 files changed, 10 insertions, 13 deletions
diff --git a/package/hotplug2/patches/140-worker_fork_fix.patch b/package/hotplug2/patches/140-worker_fork_fix.patch
index 5527b22d2..eaf3c5c36 100644
--- a/package/hotplug2/patches/140-worker_fork_fix.patch
+++ b/package/hotplug2/patches/140-worker_fork_fix.patch
@@ -1,7 +1,6 @@
-diff -x '*~' -Naur hotplug2-201/action.c hotplug2-201.patched/action.c
---- hotplug2-201/action.c 2010-04-01 04:48:10.000000000 +0300
-+++ hotplug2-201.patched/action.c 2010-04-01 04:53:49.000000000 +0300
-@@ -39,7 +39,7 @@
+--- a/action.c
++++ b/action.c
+@@ -39,7 +39,7 @@ static void action_dumb(const struct set
* Returns: Newly allocated string in "key=value" form
*
*/
@@ -10,9 +9,8 @@ diff -x '*~' -Naur hotplug2-201/action.c hotplug2-201.patched/action.c
size_t keylen, vallen;
char *combined;
-diff -x '*~' -Naur hotplug2-201/action.h hotplug2-201.patched/action.h
---- hotplug2-201/action.h 2009-12-09 20:44:14.000000000 +0200
-+++ hotplug2-201.patched/action.h 2010-04-01 04:54:14.000000000 +0300
+--- a/action.h
++++ b/action.h
@@ -12,5 +12,6 @@
#include "settings.h"
@@ -20,10 +18,9 @@ diff -x '*~' -Naur hotplug2-201/action.h hotplug2-201.patched/action.h
+char* alloc_env(const char *, const char *);
#endif /* ifndef ACTION_H */
-diff -x '*~' -Naur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers/worker_fork.c
---- hotplug2-201/workers/worker_fork.c 2010-04-01 04:52:26.000000000 +0300
-+++ hotplug2-201.patched/workers/worker_fork.c 2010-04-01 04:51:49.000000000 +0300
-@@ -380,6 +380,7 @@
+--- a/workers/worker_fork.c
++++ b/workers/worker_fork.c
+@@ -380,6 +380,7 @@ static void worker_fork_deinit(void *in_
static int worker_fork_process(void *in_ctx, struct uevent_t *uevent) {
@@ -31,7 +28,7 @@ diff -x '*~' -Naur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/worke
int i;
struct worker_fork_child_t *child;
struct worker_fork_ctx_t *ctx = in_ctx;
-@@ -406,6 +407,12 @@
+@@ -406,6 +407,12 @@ static int worker_fork_process(void *in_
* No child process is currently available.
*/
if (child == NULL) {
@@ -44,7 +41,7 @@ diff -x '*~' -Naur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/worke
/*
* Are the matching rules trivial enough that we
* can execute them in the main process?
-@@ -421,6 +428,12 @@
+@@ -421,6 +428,12 @@ static int worker_fork_process(void *in_
*/
if (ctx->children_count < ctx->max_children)
child = worker_fork_spawn(ctx);