From patchwork Mon Jan 31 17:45:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 36914 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 9547827BBEA; Mon, 31 Jan 2022 17:54:47 +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 680F427BBE9 for ; Mon, 31 Jan 2022 17:54:47 +0000 (GMT) Received: from localhost ([::1]:40626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEat4-0005EF-EK for patchwork@mira.cbaines.net; Mon, 31 Jan 2022 12:54:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEalH-0002xq-O8 for guix-patches@gnu.org; Mon, 31 Jan 2022 12:46:43 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEakc-0005Yp-5b for guix-patches@gnu.org; Mon, 31 Jan 2022 12:46:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEakc-0002aV-4W for guix-patches@gnu.org; Mon, 31 Jan 2022 12:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53063] [PATCH] installer: Use system-wide guix for system init. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Jan 2022 17:46:02 +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: Josselin Poiret , ludo@gnu.org, 53063@debbugs.gnu.org Received: via spool by 53063-submit@debbugs.gnu.org id=B53063.16436511378571 (code B ref 53063); Mon, 31 Jan 2022 17:46:02 +0000 Received: (at 53063) by debbugs.gnu.org; 31 Jan 2022 17:45:37 +0000 Received: from localhost ([127.0.0.1]:40683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEakC-0002Du-Og for submit@debbugs.gnu.org; Mon, 31 Jan 2022 12:45:37 -0500 Received: from jpoiret.xyz ([206.189.101.64]:36580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEakA-0002Bl-Q1 for 53063@debbugs.gnu.org; Mon, 31 Jan 2022 12:45:35 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 42D6B1851E5; Mon, 31 Jan 2022 17:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1643651133; 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=IIjM9mT5SqWxm8O5W8dPagnHC2E0c+HAbae3TlK/aZQ=; b=ve5vkvy6CeyzeRgyewUEKoWD2PkLX/e9/8cEhrb1kAJxMVMatJ3IGhuUiV4iXN4HuAEq1o Nb//yU59lUy2iJdzrSWMHHIMfHYKGQUrH8Agw/PhOJ3Prg8L+MPk5wYTelbEL6IfKLPW2M 9xr1FKA4lzeePS5fxTe/I2kbbs0eR0O4HWbhHw+fk8K35edzFxiN8uxJa56PFJcP7769Lt Clw6imwasb2I1/ii+XJ1RrWjAVOixjtVQWiWEXF10NBqx7BDB5ojC1a7ePalMcNXk6QZwC josflm9SKBD5Js4QcurERq/3ReV/ET70YFN/vXEMctiavu4tXnu2XGxZFLbDZw== Date: Mon, 31 Jan 2022 18:45:17 +0100 Message-Id: <0ad78d6e393a326e5f83d8355833f364ec01966c.1643650595.git.dev@jpoiret.xyz> In-Reply-To: <87mtju3bvr.fsf_-_@gnu.org> References: <87mtju3bvr.fsf_-_@gnu.org> MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: ++++ 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.scm (installer-program): Remove dependency on the guix package for the PATH. * gnu/installer/final.scm (install-system): Set PATH inside container to /run/current-system/profile/bin/. --- Here's an additional patch that will use the system-wide guix in the installer, so that tests work. Cheers, Josselin gnu/installer.scm | 1 - gnu/installer/final.scm | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 7b2914be98..415f5a7af7 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -335,7 +335,6 @@ (define set-installer-path ntfs-3g ;mkfs.ntfs xfsprogs ;mkfs.xfs kbd ;chvt - guix ;guix system init call util-linux ;mkwap nano shadow diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 2087536502..3f6dacc490 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -170,8 +170,7 @@ (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) - (path (getenv "PATH"))) + (ret #f)) (mkdir-p (%installer-target-dir)) ;; We want to initialize user passwords but we don't want to store them in @@ -210,7 +209,7 @@ (define (assert-exit x) (setvbuf (current-output-port) 'none) (setvbuf (current-error-port) 'none) - (setenv "PATH" path) + (setenv "PATH" "/run/current-system/profile/bin/") (set! ret (run-command install-command))) (lambda ()