diff mbox series

[bug#53063] installer: Use system-wide guix for system init.

Message ID 0ad78d6e393a326e5f83d8355833f364ec01966c.1643650595.git.dev@jpoiret.xyz
State Accepted
Headers show
Series [bug#53063] installer: Use system-wide guix for system init. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Josselin Poiret Jan. 31, 2022, 5:45 p.m. UTC 
* 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(-)

Comments

Mathieu Othacehe Feb. 2, 2022, 3:50 p.m. UTC | #1 
Hey Josselin,

> Here's an additional patch that will use the system-wide guix in the
> installer, so that tests work.

That's confirmed by the CI. I went ahead and pushed the whole series
with this additional patch. All those improvements are really welcomed
so thanks again for your contribution here.

Now we need people to test the soon to be 1.4.0 installer :)

Mathieu
diff mbox series

Patch

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