[bug#75810,v6,03/16] daemon: Bind-mount /etc/nsswitch.conf & co. only if it exists.
Message ID | 2818f5c7b1eaa746d3981d9fcee48aaa35b57263.1742230219.git.ludo@gnu.org |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 948E927BBEA; Mon, 17 Mar 2025 17:05:51 +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 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 57B5327BBE2 for <patchwork@mira.cbaines.net>; Mon, 17 Mar 2025 17:05:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1tuDtp-00057S-T6; Mon, 17 Mar 2025 13:05:13 -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 <Debian-debbugs@debbugs.gnu.org>) id 1tuDth-000522-Pd for guix-patches@gnu.org; Mon, 17 Mar 2025 13:05:06 -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 <Debian-debbugs@debbugs.gnu.org>) id 1tuDth-0005aa-7V for guix-patches@gnu.org; Mon, 17 Mar 2025 13:05:05 -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=Vly8ItHn5rwnMV7vC2veTfEVNWj56AI1NknVh1IQSANT5qIai6bFPiEy1pMCe+65eyOjypi5xsxnDkzjdnEIb0rNPLoVl4mCi4pvx4R2geu4lj0xNB9T+vM3u5VAwzmznYNHKyrAgAyoX7ad/SaowaNiy2gTNg5ISSg6/hRRxKiK7TltUswx6qZ1UO6lg3Bzlar5Mi2Klib0N08i0AplOgADts5ubR7O2yuLbXnTQajly+YnDqP8S6sWlDIzbupdP06ZTpCAGcDk5hfLT7DAfeXfEBDNfBThxdNpHX9ACmwWUSgjqxoejW5W3v2ETkRP36FyP58g69f/B6G7OCuShA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tuDtg-0002mb-LZ for guix-patches@gnu.org; Mon, 17 Mar 2025 13:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75810] [PATCH v6 03/16] daemon: Bind-mount /etc/nsswitch.conf & co. only if it exists. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= <ludo@gnu.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Mar 2025 17:05:04 +0000 Resent-Message-ID: <handler.75810.B75810.174223105010161@debbugs.gnu.org> 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?= <ludo@gnu.org> Received: via spool by 75810-submit@debbugs.gnu.org id=B75810.174223105010161 (code B ref 75810); Mon, 17 Mar 2025 17:05:04 +0000 Received: (at 75810) by debbugs.gnu.org; 17 Mar 2025 17:04:10 +0000 Received: from localhost ([127.0.0.1]:60642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1tuDsm-0002di-VK for submit@debbugs.gnu.org; Mon, 17 Mar 2025 13:04:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42114) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@gnu.org>) id 1tuDsJ-0002Wy-DO for 75810@debbugs.gnu.org; Mon, 17 Mar 2025 13:03:43 -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 <ludo@gnu.org>) id 1tuDsC-00053A-T7; Mon, 17 Mar 2025 13:03: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=KEyusKSTpns+y0uK7zkb SGlGL68UI/Zccd8yBo2zuzubOv6wDUZvPNDSiaLxTib6cK0cr18WFjp0UbPh2F8sZDflrn4qvwpG+ tPrg6rbjXG6icAqpFEncmRjL2L1FSiLaEzgo6tVd3HLZn76i1yREybpNMQB4nWqt2EmV7NsYVkR45 4te4oedE/KQeP0gg0e7w0Cd9kISgFtL9OBq1XZjecy+VAOI/ylTU0FyWrWc0llJ2JEnT2ii/nod7+ u8Zsyg+I7MQ/pAkClHaGZKMf2a8HNgIjEnh2b0K1dqz32I8Jmx1JePf6jtrglf21uvziiIsUAsgSN iRTnhaf2oD+3AA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= <ludo@gnu.org> Date: Mon, 17 Mar 2025 18:02:46 +0100 Message-ID: <2818f5c7b1eaa746d3981d9fcee48aaa35b57263.1742230219.git.ludo@gnu.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <cover.1742230219.git.ludo@gnu.org> References: <cover.1742230219.git.ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
Series |
Rootless guix-daemon
|
|
Commit Message
Ludovic Courtès
March 17, 2025, 5:02 p.m. UTC
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;