OSDN Git Service
(root)
/
android-x86
/
system-netd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "netd: Add NOTICE and MODULE_LICENSE_* files"
[android-x86/system-netd.git]
/
server
/
NetdConstants.cpp
diff --git
a/server/NetdConstants.cpp
b/server/NetdConstants.cpp
index
d2e0bbe
..
c86538b
100644
(file)
--- a/
server/NetdConstants.cpp
+++ b/
server/NetdConstants.cpp
@@
-73,6
+73,10
@@
static int execIptables(IptablesTarget target, bool silent, va_list args) {
std::list<const char*> argsList;
argsList.push_back(NULL);
const char* arg;
+
+ // Wait to avoid failure due to another process holding the lock
+ argsList.push_back("-w");
+
do {
arg = va_arg(args, const char *);
argsList.push_back(arg);