[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#39729] [PATCH 6/7] installer: Honor /tmp/installer-system-init-opti
From: |
Ludovic Courtès |
Subject: |
[bug#39729] [PATCH 6/7] installer: Honor /tmp/installer-system-init-options. |
Date: |
Sat, 22 Feb 2020 00:20:29 +0100 |
* 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 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
--
2.25.1
- [bug#39729] [PATCH 0/7] Testing the graphical installer, Ludovic Courtès, 2020/02/21
- [bug#39729] [PATCH 1/7] tests: 'run-basic-test' can enter a root password., Ludovic Courtès, 2020/02/21
- [bug#39729] [PATCH 4/7] installer: Bypass connectivity check when /tmp/installer-assume-online exists., Ludovic Courtès, 2020/02/21
- [bug#39729] [PATCH 6/7] installer: Honor /tmp/installer-system-init-options.,
Ludovic Courtès <=
- [bug#39729] [PATCH 2/7] installer: Use a Guile-Newt snapshot that supports 'form-watch-fd'., Ludovic Courtès, 2020/02/21
- [bug#39729] [PATCH 5/7] installer: Run commands without hopping through the shell., Ludovic Courtès, 2020/02/21
- [bug#39729] [PATCH 7/7] tests: install: Add "gui-installed-os"., Ludovic Courtès, 2020/02/21
- [bug#39729] [PATCH 3/7] installer: Implement a dialog on /var/guix/installer-socket., Ludovic Courtès, 2020/02/21
- [bug#39729] [PATCH 0/7] Testing the graphical installer, Mathieu Othacehe, 2020/02/27