diff mbox series

[bug#39729,6/7] installer: Honor /tmp/installer-system-init-options.

Message ID 20200221232030.27752-6-ludo@gnu.org
State Accepted
Headers show
Series Testing the graphical installer | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job

Commit Message

Ludovic Courtès Feb. 21, 2020, 11:20 p.m. UTC 
* gnu/installer/final.scm (install-system): Honor
"/tmp/installer-system-init-options".
---
 gnu/installer/final.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm
index 7193ecb8a4..869be8814b 100644
--- a/gnu/installer/final.scm
+++ b/gnu/installer/final.scm
@@ -111,9 +111,19 @@  cow-store service."
 Start COW-STORE service on target directory and launch guix install command in
 a subshell.  LOCALE must be the locale name under which that command will run,
 or #f.  Return #t on success and #f on failure."
-  (let ((install-command (list "guix" "system" "init" "--fallback"
-                               (%installer-configuration-file)
-                               (%installer-target-dir))))
+  (let* ((options         (catch 'system-error
+                            (lambda ()
+                              ;; If this file exists, it can provide
+                              ;; additional command-line options.
+                              (call-with-input-file
+                                  "/tmp/installer-system-init-options"
+                                read))
+                            (const '())))
+         (install-command (append (list "guix" "system" "init"
+                                        "--fallback")
+                                  options
+                                  (list (%installer-configuration-file)
+                                        (%installer-target-dir)))))
     (mkdir-p (%installer-target-dir))
 
     ;; We want to initialize user passwords but we don't want to store them in