system: Add locale to boot-parameters.
* gnu/system.scm (define-module)[export]: Add boot-parameters-locale. (<boot-parameters>)[locale]: New field. [boot-parameters-locale]: New accessor. (read-boot-parameters): Read locale field. (operating-system-boot-parameters): Provide operating-system locale to boot-parameters record. (opeating-system-boot-parameters-file): Likewise. * Makefile.am (SCM_TESTS): Add tests/boot-parameters.scm. * tests/boot-parameters.scm: New test file.
This commit is contained in:
Miguel Ángel Arruga Vivas
parent
1e30245406
commit
9d449b945b
3 changed files with 268 additions and 0 deletions
|
|
@ -407,6 +407,7 @@ SCM_TESTS = \
|
|||
tests/base16.scm \
|
||||
tests/base32.scm \
|
||||
tests/base64.scm \
|
||||
tests/boot-parameters.scm \
|
||||
tests/bournish.scm \
|
||||
tests/builders.scm \
|
||||
tests/build-utils.scm \
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019 Meiyo Peng <meiyo.peng@gmail.com>
|
||||
;;; Copyright © 2019 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
|
||||
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
|
||||
|
|
@ -148,6 +149,7 @@
|
|||
boot-parameters-bootloader-menu-entries
|
||||
boot-parameters-store-device
|
||||
boot-parameters-store-mount-point
|
||||
boot-parameters-locale
|
||||
boot-parameters-kernel
|
||||
boot-parameters-kernel-arguments
|
||||
boot-parameters-initrd
|
||||
|
|
@ -297,6 +299,7 @@ directly by the user."
|
|||
boot-parameters-bootloader-menu-entries)
|
||||
(store-device boot-parameters-store-device)
|
||||
(store-mount-point boot-parameters-store-mount-point)
|
||||
(locale boot-parameters-locale)
|
||||
(kernel boot-parameters-kernel)
|
||||
(kernel-arguments boot-parameters-kernel-arguments)
|
||||
(initrd boot-parameters-initrd)
|
||||
|
|
@ -374,6 +377,11 @@ file system labels."
|
|||
((_ args) args)
|
||||
(#f '())))
|
||||
|
||||
(locale
|
||||
(match (assq 'locale rest)
|
||||
((_ locale) locale)
|
||||
(#f #f)))
|
||||
|
||||
(store-device
|
||||
;; Linux device names like "/dev/sda1" are not suitable GRUB device
|
||||
;; identifiers, so we just filter them out.
|
||||
|
|
@ -1284,6 +1292,7 @@ such as '--root' and '--load' to <boot-parameters>."
|
|||
(let* ((initrd (and (not (operating-system-hurd os))
|
||||
(operating-system-initrd-file os)))
|
||||
(store (operating-system-store-file-system os))
|
||||
(locale (operating-system-locale os))
|
||||
(bootloader (bootloader-configuration-bootloader
|
||||
(operating-system-bootloader os)))
|
||||
(bootloader-name (bootloader-name bootloader))
|
||||
|
|
@ -1302,6 +1311,7 @@ such as '--root' and '--load' to <boot-parameters>."
|
|||
(bootloader-name bootloader-name)
|
||||
(bootloader-menu-entries
|
||||
(bootloader-configuration-menu-entries (operating-system-bootloader os)))
|
||||
(locale locale)
|
||||
(store-device (ensure-not-/dev (file-system-device store)))
|
||||
(store-mount-point (file-system-mount-point store)))))
|
||||
|
||||
|
|
@ -1354,6 +1364,7 @@ being stored into the \"parameters\" file)."
|
|||
(or (and=> (operating-system-bootloader os)
|
||||
bootloader-configuration-menu-entries)
|
||||
'())))
|
||||
(locale #$(boot-parameters-locale params))
|
||||
(store
|
||||
(device
|
||||
#$(device->sexp (boot-parameters-store-device params)))
|
||||
|
|
|
|||
256
tests/boot-parameters.scm
Normal file
256
tests/boot-parameters.scm
Normal file
|
|
@ -0,0 +1,256 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
;;; Commentary:
|
||||
;;;
|
||||
;;; Test boot parameters value storage and compatibility.
|
||||
;;;
|
||||
;;; Code:
|
||||
|
||||
(define-module (test-boot-parameters)
|
||||
#:use-module (gnu bootloader)
|
||||
#:use-module (gnu bootloader grub)
|
||||
#:use-module (gnu system)
|
||||
#:use-module (gnu system file-systems)
|
||||
#:use-module (gnu system uuid)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix store)
|
||||
#:use-module (guix tests)
|
||||
#:use-module (srfi srfi-64)
|
||||
#:use-module (rnrs bytevectors))
|
||||
|
||||
(define %default-label "GNU with Linux-libre 99.1.2")
|
||||
(define %default-kernel-path
|
||||
(string-append (%store-prefix)
|
||||
"/zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz-linux-libre-99.1.2"))
|
||||
(define %default-kernel
|
||||
(string-append %default-kernel-path "/" (system-linux-image-file-name)))
|
||||
(define %default-kernel-arguments '())
|
||||
(define %default-initrd-path
|
||||
(string-append (%store-prefix) "/wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww-initrd"))
|
||||
(define %default-initrd (string-append %default-initrd-path "/initrd.cpio.gz"))
|
||||
(define %default-root-device (uuid "abcdef12-3456-7890-abcd-ef1234567890"))
|
||||
(define %default-store-device (uuid "01234567-89ab-cdef-0123-456789abcdef"))
|
||||
(define %default-store-mount-point (%store-prefix))
|
||||
(define %default-multiboot-modules '())
|
||||
(define %default-locale "es_ES.utf8")
|
||||
(define %root-path "/")
|
||||
|
||||
(define %grub-boot-parameters
|
||||
(boot-parameters
|
||||
(bootloader-name 'grub)
|
||||
(bootloader-menu-entries '())
|
||||
(root-device %default-root-device)
|
||||
(label %default-label)
|
||||
(kernel %default-kernel)
|
||||
(kernel-arguments %default-kernel-arguments)
|
||||
(initrd %default-initrd)
|
||||
(multiboot-modules %default-multiboot-modules)
|
||||
(locale %default-locale)
|
||||
(store-device %default-store-device)
|
||||
(store-mount-point %default-store-mount-point)))
|
||||
|
||||
(define %default-operating-system
|
||||
(operating-system
|
||||
(host-name "host")
|
||||
(timezone "Europe/Berlin")
|
||||
(locale %default-locale)
|
||||
|
||||
(bootloader (bootloader-configuration
|
||||
(bootloader grub-bootloader)
|
||||
(target "/dev/sda")))
|
||||
(file-systems (cons* (file-system
|
||||
(device %default-root-device)
|
||||
(mount-point %root-path)
|
||||
(type "ext4"))
|
||||
(file-system
|
||||
(device %default-store-device)
|
||||
(mount-point %default-store-mount-point)
|
||||
(type "btrfs"))
|
||||
%base-file-systems))))
|
||||
|
||||
(define (quote-uuid uuid)
|
||||
(list 'uuid (uuid-type uuid) (uuid-bytevector uuid)))
|
||||
|
||||
;; Call read-boot-parameters with the desired string as input.
|
||||
(define* (test-read-boot-parameters
|
||||
#:key
|
||||
(version 0)
|
||||
(bootloader-name 'grub)
|
||||
(bootloader-menu-entries '())
|
||||
(label %default-label)
|
||||
(root-device (quote-uuid %default-root-device))
|
||||
(kernel %default-kernel)
|
||||
(kernel-arguments %default-kernel-arguments)
|
||||
(initrd %default-initrd)
|
||||
(multiboot-modules %default-multiboot-modules)
|
||||
(locale %default-locale)
|
||||
(with-store #t)
|
||||
(store-device
|
||||
(quote-uuid %default-store-device))
|
||||
(store-mount-point %default-store-mount-point))
|
||||
(define (generate-boot-parameters)
|
||||
(define (sexp-or-nothing fmt val)
|
||||
(cond ((eq? 'false val) (format #false fmt #false))
|
||||
(val (format #false fmt val))
|
||||
(else "")))
|
||||
(format #false "(boot-parameters~a~a~a~a~a~a~a~a~a~a)"
|
||||
(sexp-or-nothing " (version ~S)" version)
|
||||
(sexp-or-nothing " (label ~S)" label)
|
||||
(sexp-or-nothing " (root-device ~S)" root-device)
|
||||
(sexp-or-nothing " (kernel ~S)" kernel)
|
||||
(sexp-or-nothing " (kernel-arguments ~S)" kernel-arguments)
|
||||
(sexp-or-nothing " (initrd ~S)" initrd)
|
||||
(if with-store
|
||||
(format #false " (store~a~a)"
|
||||
(sexp-or-nothing " (device ~S)" store-device)
|
||||
(sexp-or-nothing " (mount-point ~S)"
|
||||
store-mount-point))
|
||||
"")
|
||||
(sexp-or-nothing " (locale ~S)" locale)
|
||||
(sexp-or-nothing " (bootloader-name ~a)" bootloader-name)
|
||||
(sexp-or-nothing " (bootloader-menu-entries ~S)"
|
||||
bootloader-menu-entries)))
|
||||
(let ((str (generate-boot-parameters)))
|
||||
(call-with-input-string str read-boot-parameters)))
|
||||
|
||||
(test-begin "boot-parameters")
|
||||
|
||||
;; XXX: <warning: unrecognized boot parameters at '#f'>
|
||||
(test-assert "read, construction, mandatory fields"
|
||||
(not (or (test-read-boot-parameters #:version #false)
|
||||
(test-read-boot-parameters #:version 'false)
|
||||
(test-read-boot-parameters #:version -1)
|
||||
(test-read-boot-parameters #:version "0")
|
||||
(test-read-boot-parameters #:root-device #false)
|
||||
(test-read-boot-parameters #:kernel #false)
|
||||
(test-read-boot-parameters #:label #false))))
|
||||
|
||||
(test-assert "read, construction, optional fields"
|
||||
(and (test-read-boot-parameters #:bootloader-name #false)
|
||||
(test-read-boot-parameters #:bootloader-menu-entries #false)
|
||||
(test-read-boot-parameters #:kernel-arguments #false)
|
||||
(test-read-boot-parameters #:with-store #false)
|
||||
(test-read-boot-parameters #:store-device #false)
|
||||
(test-read-boot-parameters #:store-device 'false)
|
||||
(test-read-boot-parameters #:store-mount-point #false)
|
||||
(test-read-boot-parameters #:multiboot-modules #false)
|
||||
(test-read-boot-parameters #:locale #false)
|
||||
(test-read-boot-parameters #:bootloader-name #false
|
||||
#:kernel-arguments #false
|
||||
#:with-store #false
|
||||
#:locale #false)))
|
||||
|
||||
(test-equal "read, default equality"
|
||||
%grub-boot-parameters
|
||||
(test-read-boot-parameters))
|
||||
|
||||
(test-equal "read, root-device, label"
|
||||
(file-system-label "my-root")
|
||||
(boot-parameters-root-device
|
||||
(test-read-boot-parameters #:root-device '(file-system-label "my-root"))))
|
||||
|
||||
(test-equal "read, root-device, /dev node"
|
||||
"/dev/sda2"
|
||||
(boot-parameters-root-device
|
||||
(test-read-boot-parameters #:root-device "/dev/sda2")))
|
||||
|
||||
(test-equal "read, kernel, only store path"
|
||||
%default-kernel
|
||||
(boot-parameters-kernel
|
||||
(test-read-boot-parameters #:kernel %default-kernel-path)))
|
||||
|
||||
(test-equal "read, kernel, full-path"
|
||||
%default-kernel
|
||||
(boot-parameters-kernel
|
||||
(test-read-boot-parameters #:kernel %default-kernel)))
|
||||
|
||||
(test-assert "read, construction, missing initrd"
|
||||
(not (boot-parameters-initrd (test-read-boot-parameters #:initrd #false))))
|
||||
|
||||
(test-equal "read, initrd, old format"
|
||||
"/a/b"
|
||||
(boot-parameters-initrd
|
||||
(test-read-boot-parameters #:initrd (list 'string-append "/a" "/b"))))
|
||||
|
||||
;; Compatibility reasons specified in gnu/system.scm.
|
||||
(test-eq "read, bootloader-name, default value"
|
||||
'grub
|
||||
(boot-parameters-bootloader-name
|
||||
(test-read-boot-parameters #:bootloader-name #false)))
|
||||
|
||||
(test-eq "read, bootloader-menu-entries, default value"
|
||||
'()
|
||||
(boot-parameters-bootloader-menu-entries
|
||||
(test-read-boot-parameters #:bootloader-menu-entries #false)))
|
||||
|
||||
(test-eq "read, kernel-arguments, default value"
|
||||
'()
|
||||
(boot-parameters-kernel-arguments
|
||||
(test-read-boot-parameters #:kernel-arguments #false)))
|
||||
|
||||
(test-assert "read, store-device, filter /dev"
|
||||
(not (boot-parameters-store-device
|
||||
(test-read-boot-parameters #:store-device "/dev/sda3"))))
|
||||
|
||||
(test-assert "read, no-store, filter /dev from root"
|
||||
(not (boot-parameters-store-device
|
||||
(test-read-boot-parameters #:root-device "/dev/sda3"
|
||||
#:with-store #false))))
|
||||
|
||||
(test-assert "read, no store-device, filter /dev from root"
|
||||
(not (boot-parameters-store-device
|
||||
(test-read-boot-parameters #:root-device "/dev/sda3"
|
||||
#:store-device #false))))
|
||||
|
||||
(test-assert "read, store-device #false, filter /dev from root"
|
||||
(not (boot-parameters-store-device
|
||||
(test-read-boot-parameters #:root-device "/dev/sda3"
|
||||
#:store-device 'false))))
|
||||
|
||||
(test-equal "read, store-device, label (legacy)"
|
||||
(file-system-label "my-store")
|
||||
(boot-parameters-store-device
|
||||
(test-read-boot-parameters #:store-device "my-store")))
|
||||
|
||||
(test-equal "read, store-device, from root"
|
||||
%default-root-device
|
||||
(boot-parameters-store-device
|
||||
(test-read-boot-parameters #:with-store #false)))
|
||||
|
||||
(test-equal "read, no store-mount-point, default"
|
||||
%root-path
|
||||
(boot-parameters-store-mount-point
|
||||
(test-read-boot-parameters #:store-mount-point #false)))
|
||||
|
||||
(test-equal "read, no store, default store-mount-point"
|
||||
%root-path
|
||||
(boot-parameters-store-mount-point
|
||||
(test-read-boot-parameters #:with-store #false)))
|
||||
|
||||
;; For whitebox testing
|
||||
(define operating-system-boot-parameters
|
||||
(@@ (gnu system) operating-system-boot-parameters))
|
||||
|
||||
(test-equal "from os, locale"
|
||||
%default-locale
|
||||
(boot-parameters-locale
|
||||
(operating-system-boot-parameters %default-operating-system
|
||||
%default-root-device)))
|
||||
|
||||
(test-end "boot-parameters")
|
||||
Reference in a new issue