From 0c9693d8b3f9ecd40732ec86b732bbf99f8e8b4d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 30 Dec 2021 11:31:45 +0100 Subject: installer: Do not set the locale in run-command. Installing the locale inside the container, once the cow-store is mounted, causes the process to keep opened locale files that can later prevent the cow-store umount. * gnu/installer/utils.scm (run-command): Remove locale argument. * gnu/installer/final.scm (install-system): Adapt it. --- gnu/installer/utils.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gnu/installer/utils.scm') diff --git a/gnu/installer/utils.scm b/gnu/installer/utils.scm index bb97bc5560..9bd41e2ca0 100644 --- a/gnu/installer/utils.scm +++ b/gnu/installer/utils.scm @@ -74,9 +74,9 @@ (define (read-percentage percentage) (and result (string->number (match:substring result 1))))) -(define* (run-command command #:key locale) - "Run COMMAND, a list of strings, in the given LOCALE. Return true if -COMMAND exited successfully, #f otherwise." +(define* (run-command command) + "Run COMMAND, a list of strings. Return true if COMMAND exited +successfully, #f otherwise." (define env (environ)) (define (pause) @@ -90,18 +90,6 @@ (define (pause) (setenv "PATH" "/run/current-system/profile/bin") - (when locale - (let ((supported? (false-if-exception - (setlocale LC_ALL locale)))) - ;; If LOCALE is not supported, then set LANGUAGE, which might at - ;; least give us translated messages. - (if supported? - (setenv "LC_ALL" locale) - (setenv "LANGUAGE" - (string-take locale - (or (string-index locale #\_) - (string-length locale))))))) - (guard (c ((invoke-error? c) (newline) (format (current-error-port) -- cgit v1.2.3