summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosselin Poiret <dev@jpoiret.xyz>2022-01-31 18:45:17 +0100
committerMathieu Othacehe <othacehe@gnu.org>2022-02-02 12:07:08 +0100
commitbc65f8318481c3e49b1ef4af62169c186c96b225 (patch)
tree2bf2eed6d563505457cb11cf7d818d0b7b2964e7
parent1e2f0cca1ae6bf10bec0f746799447cc6336655a (diff)
installer: Use system-wide guix for system init.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.scm1
-rw-r--r--gnu/installer/final.scm5
2 files changed, 2 insertions, 4 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 7b2914be980..415f5a7af78 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -335,7 +335,6 @@ selected keymap."
335 ntfs-3g ;mkfs.ntfs 335 ntfs-3g ;mkfs.ntfs
336 xfsprogs ;mkfs.xfs 336 xfsprogs ;mkfs.xfs
337 kbd ;chvt 337 kbd ;chvt
338 guix ;guix system init call
339 util-linux ;mkwap 338 util-linux ;mkwap
340 nano 339 nano
341 shadow 340 shadow
diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm
index 2087536502e..3f6dacc4903 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."
170 (database-dir "/var/guix/db") 170 (database-dir "/var/guix/db")
171 (database-file (string-append database-dir "/db.sqlite")) 171 (database-file (string-append database-dir "/db.sqlite"))
172 (saved-database (string-append database-dir "/db.save")) 172 (saved-database (string-append database-dir "/db.save"))
173 (ret #f) 173 (ret #f))
174 (path (getenv "PATH")))
175 (mkdir-p (%installer-target-dir)) 174 (mkdir-p (%installer-target-dir))
176 175
177 ;; We want to initialize user passwords but we don't want to store them in 176 ;; 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."
210 (setvbuf (current-output-port) 'none) 209 (setvbuf (current-output-port) 'none)
211 (setvbuf (current-error-port) 'none) 210 (setvbuf (current-error-port) 'none)
212 211
213 (setenv "PATH" path) 212 (setenv "PATH" "/run/current-system/profile/bin/")
214 213
215 (set! ret (run-command install-command))) 214 (set! ret (run-command install-command)))
216 (lambda () 215 (lambda ()