guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

11/12: installer: Honor /tmp/installer-system-init-options.


From: guix-commits
Subject: 11/12: installer: Honor /tmp/installer-system-init-options.
Date: Fri, 21 Feb 2020 17:08:40 -0500 (EST)

civodul pushed a commit to branch wip-installer-test
in repository guix.

commit 7084515983943ac22831704adacf426d643e0024
Author: Ludovic Court├Ęs <address@hidden>
AuthorDate: Wed Feb 19 22:54:11 2020 +0100

    installer: Honor /tmp/installer-system-init-options.
    
    * 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 --git a/gnu/installer/final.scm b/gnu/installer/final.scm
index 7193ecb..869be88 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]