summaryrefslogtreecommitdiff
path: root/gnu/installer/final.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-04-23 00:08:54 +0200
committerLudovic Courtès <ludo@gnu.org>2019-04-23 00:34:47 +0200
commit7611074f677f1c3cfe5da426f387eeda1b6ad825 (patch)
treef9a87a7b7167665344ff36f1540b6ac9a3583fad /gnu/installer/final.scm
parent5582aa8e31bf88f981caedeb4fbbb758486b6ca7 (diff)
downloadguix-patches-7611074f677f1c3cfe5da426f387eeda1b6ad825.tar
guix-patches-7611074f677f1c3cfe5da426f387eeda1b6ad825.tar.gz
installer: Run 'guix system init' with the right locale.
* gnu/installer/utils.scm (run-shell-command): Add #:locale and honor it. * gnu/installer/newt/final.scm (run-install-shell): Add 'locale' parameter; pass it to 'install-system'. (run-final-page): Obtain locale from RESULT; pass it to 'run-install-shell'. * gnu/installer/final.scm (install-system): Add 'locale' parameter; pass it to 'run-shell-command'.
Diffstat (limited to 'gnu/installer/final.scm')
-rw-r--r--gnu/installer/final.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm
index e1c62f5ce0..07946f72c3 100644
--- a/gnu/installer/final.scm
+++ b/gnu/installer/final.scm
@@ -24,13 +24,15 @@
#:use-module (guix build utils)
#:export (install-system))
-(define (install-system)
+(define (install-system locale)
"Start COW-STORE service on target directory and launch guix install command
-in a subshell."
+in a subshell. LOCALE must be the locale name under which that command will
+run, or #f."
(let ((install-command
(format #f "guix system init ~a ~a"
(%installer-configuration-file)
(%installer-target-dir))))
(mkdir-p (%installer-target-dir))
(start-service 'cow-store (list (%installer-target-dir)))
- (false-if-exception (run-shell-command install-command))))
+ (false-if-exception (run-shell-command install-command
+ #:locale locale))))