diff options
| author | Miguel Ángel Arruga Vivas <rosen644835@gmail.com> | 2019-04-22 14:44:22 +0200 |
|---|---|---|
| committer | Miguel Ángel Arruga Vivas <rosen644835@gmail.com> | 2020-10-18 15:33:05 +0200 |
| commit | eaf096398349a484bd23fd829755f7dfaf237ab4 (patch) | |
| tree | 53807d5796f6c72971c49f42a05eeffe30db0e63 | |
| parent | 9d449b945bbad5b7c66ed874b347f7f0ffd012e1 (diff) | |
| download | guix-eaf096398349a484bd23fd829755f7dfaf237ab4.tar.gz | |
system: Provide locale information to the bootloader.
* gnu/machine/ssh.scm (roll-back-managed-host): Use locale information from boot-parameters. * gnu/system.scm (operating-system-bootcfg): Provide locale information to the bootloader. * guix/system/script.scm (reinstall-bootloader): Use locale information from boot-parameters.
| -rw-r--r-- | gnu/machine/ssh.scm | 3 | ||||
| -rw-r--r-- | gnu/system.scm | 2 | ||||
| -rw-r--r-- | guix/scripts/system.scm | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 35b42add48..5020bd362f 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -480,6 +480,8 @@ an environment type of 'managed-host." (raise roll-back-failure))) (entries -> (map boot-parameters->menu-entry (list (second boot-parameters)))) + (locale -> (boot-parameters-locale + (second boot-parameters))) (old-entries -> (map boot-parameters->menu-entry (drop boot-parameters 2))) (bootloader -> (operating-system-bootloader @@ -489,6 +491,7 @@ an environment type of 'managed-host." (bootloader-configuration-bootloader bootloader)) bootloader entries + #:locale locale #:old-entries old-entries))) (remote-result (machine-remote-eval machine remote-exp))) (when (eqv? 'error remote-result) diff --git a/gnu/system.scm b/gnu/system.scm index e8fe41cc24..a3122eaa65 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1242,6 +1242,7 @@ a list of <menu-entry>, to populate the \"old entries\" menu." (let* ((file-systems (operating-system-file-systems os)) (root-fs (operating-system-root-file-system os)) (root-device (file-system-device root-fs)) + (locale (operating-system-locale os)) (params (operating-system-boot-parameters os root-device #:system-kernel-arguments? #t)) @@ -1254,6 +1255,7 @@ a list of <menu-entry>, to populate the \"old entries\" menu." (generate-config-file bootloader-conf (list entry) #:old-entries old-entries + #:locale locale #:store-directory-prefix (btrfs-store-subvolume-file-name file-systems)))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 939559e719..9ed5c26483 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -384,6 +384,7 @@ STORE is an open connection to the store." ;; Make the specified system generation the default entry. (params (first (profile-boot-parameters %system-profile (list number)))) + (locale (boot-parameters-locale params)) (old-generations (delv number (reverse (generation-numbers %system-profile)))) (old-params (profile-boot-parameters @@ -396,6 +397,7 @@ STORE is an open connection to the store." ((bootcfg (lower-object ((bootloader-configuration-file-generator bootloader) bootloader-config entries + #:locale locale #:old-entries old-entries))) (drvs -> (list bootcfg))) (mbegin %store-monad |