From 95c65ce6374ee49814075d8898a2b2cc182c832e Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Wed, 21 Jan 2026 15:59:30 +0100 Subject: [PATCH] libstore: move setPersonality to linux platform it doesn't do anything anywhere else, and personality setup is not a critical operation (all it does is change which arch uname returns). Change-Id: I39d7fcc4916e6882e49191d2294f9b7ee0dbbcd0 --- lix/libstore/build/local-derivation-goal.cc | 2 -- lix/libstore/platform/linux.cc | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lix/libstore/build/local-derivation-goal.cc b/lix/libstore/build/local-derivation-goal.cc index 8c5e4edd4..3d8b8d9f9 100644 --- a/lix/libstore/build/local-derivation-goal.cc +++ b/lix/libstore/build/local-derivation-goal.cc @@ -1157,8 +1157,6 @@ void LocalDerivationGoal::runChild() /* Close all other file descriptors. */ closeExtraFDs(); - setPersonality(drv->platform); - /* Disable core dumps by default. */ struct rlimit limit = { 0, RLIM_INFINITY }; if (settings.enableCoreDumps) { diff --git a/lix/libstore/platform/linux.cc b/lix/libstore/platform/linux.cc index 792a46216..15d4aa5b6 100644 --- a/lix/libstore/platform/linux.cc +++ b/lix/libstore/platform/linux.cc @@ -1,3 +1,4 @@ +#include "build/personality.hh" #include "lix/libstore/build/worker.hh" #include "lix/libutil/c-calls.hh" #include "lix/libutil/cgroup.hh" @@ -1229,6 +1230,8 @@ bool LinuxLocalDerivationGoal::prepareChildSetup() } } + setPersonality(drv->platform); + return false; }