about summary refs log tree commit diff
path: root/src/libstore/remote-store.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-10-11T16·48+0200
committerEelco Dolstra <edolstra@gmail.com>2020-01-04T12·41+0100
commit8b44ed08e773017a3bdf9f527bbbdba7c6d4b1b8 (patch)
tree582cb0c82419c35bae54ec731fed1ec8e2b5d596 /src/libstore/remote-store.cc
parent1ac8c0269a97853e762fb40a5105e4e99b9dc1e4 (diff)
ssh-ng: Don't set CPU affinity on the remote
Fixes #3138.

(cherry picked from commit 906d56a96b442d4dd8f924c1ce0d1eec0e214af3)
Diffstat (limited to 'src/libstore/remote-store.cc')
-rw-r--r--src/libstore/remote-store.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index b7f202a6bbcb..f34369d8fe0a 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -151,7 +151,7 @@ void RemoteStore::initConnection(Connection & conn)
         conn.to << PROTOCOL_VERSION;
 
         if (GET_PROTOCOL_MINOR(conn.daemonVersion) >= 14) {
-            int cpu = settings.lockCPU ? lockToCurrentCPU() : -1;
+            int cpu = sameMachine() && settings.lockCPU ? lockToCurrentCPU() : -1;
             if (cpu != -1)
                 conn.to << 1 << cpu;
             else