From patchwork Sat Jan 15 13:49:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 36371 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 EDE2D27BBEA; Sat, 15 Jan 2022 13:52: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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 C2C6327BBE9 for ; Sat, 15 Jan 2022 13:52:43 +0000 (GMT) Received: from localhost ([::1]:39888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8jU2-0006NY-RY for patchwork@mira.cbaines.net; Sat, 15 Jan 2022 08:52:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8jSS-0005Ds-5J for guix-patches@gnu.org; Sat, 15 Jan 2022 08:51:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8jSR-0004Ek-Ag for guix-patches@gnu.org; Sat, 15 Jan 2022 08:51:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8jSR-0001qi-AU for guix-patches@gnu.org; Sat, 15 Jan 2022 08:51:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53063] [PATCH v2 wip-harden-installer 05/18] installer: Keep PATH inside the install container. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jan 2022 13:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53063 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 53063@debbugs.gnu.org, ludo@gnu.org, Josselin Poiret Received: via spool by 53063-submit@debbugs.gnu.org id=B53063.16422546386954 (code B ref 53063); Sat, 15 Jan 2022 13:51:03 +0000 Received: (at 53063) by debbugs.gnu.org; 15 Jan 2022 13:50:38 +0000 Received: from localhost ([127.0.0.1]:39492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8jS2-0001o3-3N for submit@debbugs.gnu.org; Sat, 15 Jan 2022 08:50:38 -0500 Received: from jpoiret.xyz ([206.189.101.64]:48758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8jRs-0001ma-Qa for 53063@debbugs.gnu.org; Sat, 15 Jan 2022 08:50:29 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 68A3F18506B; Sat, 15 Jan 2022 13:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1642254627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tOwdgrzuOYtn3xYvEURZFgaseGrFEkEaeRODXcanMsI=; b=Q5APLl2/x3t4kufa+FDJRhIsEJ+ZSRYezbWDNnz+y5gBeiIvtEsh9QUsBjfhlocewgzW7y e1kS/EY5Hdo0qcyh/HE3j8mPKvAdyyWrZocSJyImgCJntjtsoDwEKMr1UVl/Ce9LI0qycN YbHbHHLlHAuttQy6Cjo7yE5ODDE+FGk/hv4V0qjhogj8nDaHtvutKXfvbmNsdP9VX2Jy0S tCXBUFR8BlkEPIv8yqg0FLWygoj7poNYHR58q+djNolMlgp5veMiPZ/2IyeNtDZwthSVof x5r8nKB8ffjHKX6Pn0u39mGJorWX2KhuakWSve8UIyiUdFnoL1IEGlYr9swk9A== Date: Sat, 15 Jan 2022 14:49:58 +0100 Message-Id: <20220115135011.5817-6-dev@jpoiret.xyz> In-Reply-To: <20220115135011.5817-1-dev@jpoiret.xyz> References: <8735lz4xsv.fsf@gnu.org> <20220115135011.5817-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/installer/final.scm (install-system): Set PATH inside the container. --- gnu/installer/final.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index fbfac1f692..7d5eca4c7e 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -169,7 +169,8 @@ (define (assert-exit x) (database-dir "/var/guix/db") (database-file (string-append database-dir "/db.sqlite")) (saved-database (string-append database-dir "/db.save")) - (ret #f)) + (ret #f) + (path (getenv "PATH"))) (mkdir-p (%installer-target-dir)) ;; We want to initialize user passwords but we don't want to store them in @@ -208,6 +209,8 @@ (define (assert-exit x) (setvbuf (current-output-port) 'none) (setvbuf (current-error-port) 'none) + (setenv "PATH" path) + ;; If there are any connected clients, assume that we are running ;; installation tests. In that case, dump the standard and error ;; outputs to syslog.