[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/20: installer: Use system-wide guix for system init.
From: |
guix-commits |
Subject: |
20/20: installer: Use system-wide guix for system init. |
Date: |
Wed, 2 Feb 2022 10:47:07 -0500 (EST) |
mothacehe pushed a commit to branch master
in repository guix.
commit 4943ac86e4f95a2e14fd209f3fdaac74a0d9ca2e
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Mon Jan 31 18:45:17 2022 +0100
installer: Use system-wide guix for system init.
* 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/.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
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 @@ selected keymap."
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 @@ or #f. Return #t on success and #f on failure."
(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 @@ or #f. Return #t on success and #f on failure."
(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 ()
- branch master updated (8f58508327 -> 4943ac86e4), guix-commits, 2022/02/02
- 20/20: installer: Use system-wide guix for system init.,
guix-commits <=
- 11/20: installer: Raise condition when mklabel fails., guix-commits, 2022/02/02
- 01/20: installer: Add crash dump upload support., guix-commits, 2022/02/02
- 02/20: installer: Use define instead of let at top-level., guix-commits, 2022/02/02
- 04/20: installer: Use new installer-log-line everywhere., guix-commits, 2022/02/02
- 09/20: installer: Add installer-specific run command process., guix-commits, 2022/02/02
- 06/20: installer: Keep PATH inside the install container., guix-commits, 2022/02/02
- 12/20: installer: Fix run-file-textbox-page when edit-button is #f., guix-commits, 2022/02/02
- 17/20: installer: Use dynamic-wind to setup installer., guix-commits, 2022/02/02
- 13/20: installer: Replace run-command by invoke in newt/page.scm., guix-commits, 2022/02/02
- 03/20: installer: Generalize logging facility., guix-commits, 2022/02/02