me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Miguel Ángel Arruga Vivas 2019-04-22 14:44:22 +02:00
parent 9d449b945b
commit eaf0963983
No known key found for this signature in database
GPG Key ID: 634C6E8979FABEC2
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/machine/ssh.scm
View File

@ -480,6 +480,8 @@ an environment type of 'managed-host."
(raise roll-back-failure))) (raise roll-back-failure)))
(entries -> (map boot-parameters->menu-entry (entries -> (map boot-parameters->menu-entry
(list (second boot-parameters)))) (list (second boot-parameters))))
(locale -> (boot-parameters-locale
(second boot-parameters)))
(old-entries -> (map boot-parameters->menu-entry (old-entries -> (map boot-parameters->menu-entry
(drop boot-parameters 2))) (drop boot-parameters 2)))
(bootloader -> (operating-system-bootloader (bootloader -> (operating-system-bootloader
@ -489,6 +491,7 @@ an environment type of 'managed-host."
(bootloader-configuration-bootloader (bootloader-configuration-bootloader
bootloader)) bootloader))
bootloader entries bootloader entries
#:locale locale
#:old-entries old-entries))) #:old-entries old-entries)))
(remote-result (machine-remote-eval machine remote-exp))) (remote-result (machine-remote-eval machine remote-exp)))
(when (eqv? 'error remote-result) (when (eqv? 'error remote-result)

2
gnu/system.scm
View File

@ -1242,6 +1242,7 @@ a list of <menu-entry>, to populate the \"old entries\" menu."
(let* ((file-systems (operating-system-file-systems os)) (let* ((file-systems (operating-system-file-systems os))
(root-fs (operating-system-root-file-system os)) (root-fs (operating-system-root-file-system os))
(root-device (file-system-device root-fs)) (root-device (file-system-device root-fs))
(locale (operating-system-locale os))
(params (operating-system-boot-parameters (params (operating-system-boot-parameters
os root-device os root-device
#:system-kernel-arguments? #t)) #: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) (generate-config-file bootloader-conf (list entry)
#:old-entries old-entries #:old-entries old-entries
#:locale locale
#:store-directory-prefix #:store-directory-prefix
(btrfs-store-subvolume-file-name file-systems)))) (btrfs-store-subvolume-file-name file-systems))))

2
guix/scripts/system.scm
View File

@ -384,6 +384,7 @@ STORE is an open connection to the store."
;; Make the specified system generation the default entry. ;; Make the specified system generation the default entry.
(params (first (profile-boot-parameters %system-profile (params (first (profile-boot-parameters %system-profile
(list number)))) (list number))))
(locale (boot-parameters-locale params))
(old-generations (old-generations
(delv number (reverse (generation-numbers %system-profile)))) (delv number (reverse (generation-numbers %system-profile))))
(old-params (profile-boot-parameters (old-params (profile-boot-parameters
@ -396,6 +397,7 @@ STORE is an open connection to the store."
((bootcfg (lower-object ((bootcfg (lower-object
((bootloader-configuration-file-generator bootloader) ((bootloader-configuration-file-generator bootloader)
bootloader-config entries bootloader-config entries
#:locale locale
#:old-entries old-entries))) #:old-entries old-entries)))
(drvs -> (list bootcfg))) (drvs -> (list bootcfg)))
(mbegin %store-monad (mbegin %store-monad