[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/10: installer: Honor /tmp/installer-system-init-options.
From: |
guix-commits |
Subject: |
09/10: installer: Honor /tmp/installer-system-init-options. |
Date: |
Wed, 19 Feb 2020 17:48:49 -0500 (EST) |
civodul pushed a commit to branch wip-installer-test
in repository guix.
commit b51e9a968adc03012c2ae0e96a58d08d89225cae
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
- branch wip-installer-test created (now 299ae5b), guix-commits, 2020/02/19
- 01/10: marionette: 'wait-for' procedures no longer leak a port., guix-commits, 2020/02/19
- 02/10: installer: Add 'syslog' macro to write to syslog., guix-commits, 2020/02/19
- 04/10: DRAFT installer: Use a Guile-Newt snapshot that supports 'form-watch-fd'., guix-commits, 2020/02/19
- 07/10: installer: Bypass connectivity check when /tmp/installer-assume-online exists., guix-commits, 2020/02/19
- 05/10: DRAFT installer: Implement a dialog on /var/guix/installer-socket., guix-commits, 2020/02/19
- 09/10: installer: Honor /tmp/installer-system-init-options.,
guix-commits <=
- 06/10: DRAFT installer: Better support for multiple clients., guix-commits, 2020/02/19
- 10/10: DRAFT tests: install: Add "gui-installed-os"., guix-commits, 2020/02/19
- 08/10: installer: Run commands without hopping through the shell., guix-commits, 2020/02/19
- 03/10: installer: Log important bits to syslog., guix-commits, 2020/02/19