From patchwork Sun Mar 23 14:24:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 40734 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D7E7B27BBEA; Sun, 23 Mar 2025 14:26:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9DC8C27BBE2 for ; Sun, 23 Mar 2025 14:26:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twMHG-0002zk-Lv; Sun, 23 Mar 2025 10:26:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twMHE-0002z2-Jb for guix-patches@gnu.org; Sun, 23 Mar 2025 10:26:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twMHE-0005V6-Ao for guix-patches@gnu.org; Sun, 23 Mar 2025 10:26:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=5fbggu8STjwEXFRRV3Gq/UXyTgxUmf6fh1UKO8gjNXs=; b=mAnaqiJTBqrmUnGfDxvKO8jWmskKQnqjA17zzh0VIGF3tymcSb6Nv/DKWDrsboGZqlxJWPMgJGm0HWFJWy3w2Ca4WzNKyWPbVN3iXbQKyZG9LF1F790Xg+sRQGHV/VPzlpg6/Yg+qQ9ML+cT2JIuAcvsyaDlpxoY3yHPL7XYtS/a4IBPT99wRnBXlpTTNVjq9hRgIyK9+RhQwZ/OIXMC/rQcKAzxVKV2ZfB8GuKaje92LIWaYfv64ylYTHPDtiF9IzG4qfr+yGUHa2OJhJKnG1vCMF1CyvTFmCtj+z6hMz52TB/T/apf+WtFywzCIQU8CRJEIq6AxhB4K8guC52rdw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1twMHD-0005XU-VV for guix-patches@gnu.org; Sun, 23 Mar 2025 10:26:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75810] [PATCH v8 03/16] daemon: Bind-mount /etc/nsswitch.conf & co. only if it exists. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Mar 2025 14:26:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75810 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75810@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 75810-submit@debbugs.gnu.org id=B75810.174273996121148 (code B ref 75810); Sun, 23 Mar 2025 14:26:11 +0000 Received: (at 75810) by debbugs.gnu.org; 23 Mar 2025 14:26:01 +0000 Received: from localhost ([127.0.0.1]:51864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1twMH1-0005UU-8f for submit@debbugs.gnu.org; Sun, 23 Mar 2025 10:26:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43722) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1twMGh-0005Q0-7q for 75810@debbugs.gnu.org; Sun, 23 Mar 2025 10:25:40 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twMGb-0005Rq-Tc; Sun, 23 Mar 2025 10:25:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=5fbggu8STjwEXFRRV3Gq/UXyTgxUmf6fh1UKO8gjNXs=; b=W2EV1L3V0Dc7frUkdtLK 79XeH4Eis3nztqB3bJjMv8s0dXJr28I6symcecnaRfYQfa9q8MELovp22556LJQ8FrxyAUEjD2xlJ JxRsIy3RCGF0boeOFNWIgq887L60kXOv8BK/zIeRsBPeKWVBqZvoFujWlEHLT8SMtk/CcLHiVCCWN 99KvHcfYe/D+3c9ZPVoGJXK7PR9bih9VdNBvdQYrMYkFRrlPA2Rn7dWST6aciww43b5uY/vowT848 9wn4EVYws6aojSxxrElgR5ppl6eh96QhoVCug4rS+y3eAaNT6eyVw+1CkOt6/dlaG2/9TXFFxmqgQ t5yIVgbSrcZgMw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 23 Mar 2025 15:24:56 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Those files may be missing in some contexts, for instance within the build environment. * nix/libstore/build.cc (DerivationGoal::runChild): Add /etc/resolv.conf and related files to ‘ss’ only if they exist. Change-Id: Ie19664a86c8101a1dc82cf39ad4b7abb10f8250a --- nix/libstore/build.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index edd01bab34..8ca5e5b732 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -2093,10 +2093,11 @@ void DerivationGoal::runChild() network, so give them access to /etc/resolv.conf and so on. */ if (fixedOutput) { - ss.push_back("/etc/resolv.conf"); - ss.push_back("/etc/nsswitch.conf"); - ss.push_back("/etc/services"); - ss.push_back("/etc/hosts"); + auto files = { "/etc/resolv.conf", "/etc/nsswitch.conf", + "/etc/services", "/etc/hosts" }; + for (auto & file: files) { + if (pathExists(file)) ss.push_back(file); + } } for (auto & i : ss) dirsInChroot[i] = i;