GNU bug report logs - #53063
[PATCH wip-harden-installer 00/14] General improvements to the installer

Previous Next

Full log

Message #125 received at 53063 <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: Josselin Poiret <dev <at> jpoiret.xyz>, ludo <at> gnu.org, 53063 <at> debbugs.gnu.org
Subject: [PATCH] installer: Use system-wide guix for system init.
Date: Mon, 31 Jan 2022 18:45:17 +0100

* 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 ()
-- 
2.34.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.