From: "Ludovic Courtès" <ludo@gnu.org>
To: 39729@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#39729] [PATCH 6/7] installer: Honor /tmp/installer-system-init-options.
Date: Sat, 22 Feb 2020 00:20:29 +0100 [thread overview]
Message-ID: <20200221232030.27752-6-ludo@gnu.org> (raw)
In-Reply-To: <20200221232030.27752-1-ludo@gnu.org>
* 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
next prev parent reply other threads:[~2020-02-21 23:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 23:16 [bug#39729] [PATCH 0/7] Testing the graphical installer Ludovic Courtès
2020-02-21 23:20 ` [bug#39729] [PATCH 1/7] tests: 'run-basic-test' can enter a root password Ludovic Courtès
2020-02-21 23:20 ` [bug#39729] [PATCH 2/7] installer: Use a Guile-Newt snapshot that supports 'form-watch-fd' Ludovic Courtès
2020-02-21 23:20 ` [bug#39729] [PATCH 3/7] installer: Implement a dialog on /var/guix/installer-socket Ludovic Courtès
2020-02-21 23:20 ` [bug#39729] [PATCH 4/7] installer: Bypass connectivity check when /tmp/installer-assume-online exists Ludovic Courtès
2020-02-21 23:20 ` [bug#39729] [PATCH 5/7] installer: Run commands without hopping through the shell Ludovic Courtès
2020-02-21 23:20 ` Ludovic Courtès [this message]
2020-02-21 23:20 ` [bug#39729] [PATCH 7/7] tests: install: Add "gui-installed-os" Ludovic Courtès
2020-02-27 16:10 ` [bug#39729] [PATCH 0/7] Testing the graphical installer Mathieu Othacehe
2020-03-05 22:46 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200221232030.27752-6-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=39729@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.