commit 324acdce6933a90e0d6821fb367627bba8073e37
author Tao Wu <lepton@google.com> Thu Sep 22 08:22:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 22 08:22:14 2016 +0000
tree 6e61d716ef9f6939c425097bbbbd59b0febe0d4d
parent a8b88e1de77a73303a600198b8c1c5a8c388b6b9
parent 3562fd0fa85ca59e5650f1fa21ae1f1e0cd9cf46

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

Change-Id: I8ff768ce0e4ddd5e2810e40302bf597e2f39387b

adb/client/main.cpp

diff --git a/adb/client/main.cpp b/adb/client/main.cpp
index f9696f3..fb06bd9 100644
--- a/adb/client/main.cpp
+++ b/adb/client/main.cpp
@@ -128,7 +128,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