diff options
| author | Josselin Poiret <dev@jpoiret.xyz> | 2022-01-31 18:45:17 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2022-02-02 12:07:08 +0100 |
| commit | bc65f8318481c3e49b1ef4af62169c186c96b225 (patch) | |
| tree | 2bf2eed6d563505457cb11cf7d818d0b7b2964e7 | |
| parent | 1e2f0cca1ae6bf10bec0f746799447cc6336655a (diff) | |
installer: Use system-wide guix for system init.origin/wip-harden-installer
* 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>
| -rw-r--r-- | gnu/installer.scm | 1 | ||||
| -rw-r--r-- | 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 () |