commit 3cb49ddb8acf1dc7db026768bc014971ba404ea8
author Tao Wu <lepton@google.com> Thu Sep 22 11:55:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 22 11:55:23 2016 +0000
tree 8a8ba5d77bdbf50dc1c913dc781a5c2fde8439e5
parent 8256443b690b1cd9e108a9fa41d075c9ac834f7b
parent c12633bb3ce993b43245a53343c6f86b407b9d88

Merge "Ignore setsid error in some cases." am: 3562fd0fa8
am: 324acdce69

Change-Id: I330be058b8c0d7b175845b30d59f091432d62f6c

adb/client/main.cpp

diff --git a/adb/client/main.cpp b/adb/client/main.cpp
index 279bb70..4ec0fc2 100644
--- a/adb/client/main.cpp
+++ b/adb/client/main.cpp
@@ -129,7 +129,9 @@
         // Start a new session for the daemon. Do this here instead of after the fork so
         // that a ctrl-c between the "starting server" and "done starting server" messages
         // gets a chance to terminate the server.
-        if (setsid() == -1) {
+        // setsid will fail with EPERM if it's already been a lead process of new session.
+        // Ignore such error.
+        if (setsid() == -1 && errno != EPERM) {
             fatal("setsid() failed: %s", strerror(errno));
         }
 #endif