[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/11: installer: Honor /tmp/installer-system-init-options.
From: |
guix-commits |
Subject: |
06/11: installer: Honor /tmp/installer-system-init-options. |
Date: |
Thu, 5 Mar 2020 17:42:27 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit e458726ab47a3748d80eb69c3c2545b414a73836
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 master updated (2c2b1ef -> bc8b2ff), guix-commits, 2020/03/05
- 02/11: installer: Use a Guile-Newt snapshot that supports 'form-watch-fd'., guix-commits, 2020/03/05
- 06/11: installer: Honor /tmp/installer-system-init-options.,
guix-commits <=
- 04/11: installer: Bypass connectivity check when /tmp/installer-assume-online exists., guix-commits, 2020/03/05
- 01/11: tests: 'run-basic-test' can enter a root password., guix-commits, 2020/03/05
- 05/11: installer: Run commands without hopping through the shell., guix-commits, 2020/03/05
- 08/11: installer: Fix cow-store umount., guix-commits, 2020/03/05
- 09/11: tests: install: Add %test-gui-installed-os-encrypted., guix-commits, 2020/03/05
- 11/11: ci: Adjust 'channel-build-system' for when the source is a file name., guix-commits, 2020/03/05
- 07/11: tests: install: Add "gui-installed-os"., guix-commits, 2020/03/05
- 03/11: installer: Implement a dialog on /var/guix/installer-socket., guix-commits, 2020/03/05
- 10/11: hydra: Remove uses of _IOLBF., guix-commits, 2020/03/05