amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

installer: Use system-wide guix for system init.

Browse source 
* 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>
This commit is contained in:
Josselin Poiret 2022-01-31 18:45:17 +01:00 • committed by Mathieu Othacehe
parent ad55ccf9b1
commit 4943ac86e4
No known key found for this signature in database
GPG key ID: 8354763531769CA6
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/installer.scm
View file

@ -335,7 +335,6 @@ selected keymap."
ntfs-3g ;mkfs.ntfs ntfs-3g ;mkfs.ntfs
xfsprogs ;mkfs.xfs xfsprogs ;mkfs.xfs
kbd ;chvt kbd ;chvt
guix ;guix system init call
util-linux ;mkwap util-linux ;mkwap
nano nano
shadow shadow

5
gnu/installer/final.scm
View file

@ -170,8 +170,7 @@ or #f. Return #t on success and #f on failure."
(database-dir "/var/guix/db") (database-dir "/var/guix/db")
(database-file (string-append database-dir "/db.sqlite")) (database-file (string-append database-dir "/db.sqlite"))
(saved-database (string-append database-dir "/db.save")) (saved-database (string-append database-dir "/db.save"))
(ret #f) (ret #f))
(path (getenv "PATH")))
(mkdir-p (%installer-target-dir)) (mkdir-p (%installer-target-dir))
;; We want to initialize user passwords but we don't want to store them in ;; 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-output-port) 'none)
(setvbuf (current-error-port) 'none) (setvbuf (current-error-port) 'none)
(setenv "PATH" path) (setenv "PATH" "/run/current-system/profile/bin/")
(set! ret (run-command install-command))) (set! ret (run-command install-command)))
(lambda () (lambda ()