From patchwork Tue Apr 23 13:26:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Miguel Arruga Vivas X-Patchwork-Id: 13737 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E91A216EFC; Tue, 23 Apr 2019 14:30:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9C04216EFA for ; Tue, 23 Apr 2019 14:30:41 +0100 (BST) Received: from localhost ([127.0.0.1]:53969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIvVR-0006uC-7J for patchwork@mira.cbaines.net; Tue, 23 Apr 2019 09:30:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIvRw-0003g0-Ii for guix-patches@gnu.org; Tue, 23 Apr 2019 09:27:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIvRu-0001y6-9b for guix-patches@gnu.org; Tue, 23 Apr 2019 09:27:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hIvRu-0001xp-3X for guix-patches@gnu.org; Tue, 23 Apr 2019 09:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hIvRt-0007GB-SG for guix-patches@gnu.org; Tue, 23 Apr 2019 09:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35394] [PATCH 1/3] system: Add locale to boot-parameters. References: <20190423151702.05258473@gmail.com> In-Reply-To: <20190423151702.05258473@gmail.com> Resent-From: Miguel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Apr 2019 13:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35394@debbugs.gnu.org Received: via spool by 35394-submit@debbugs.gnu.org id=B35394.155602599227846 (code B ref 35394); Tue, 23 Apr 2019 13:27:01 +0000 Received: (at 35394) by debbugs.gnu.org; 23 Apr 2019 13:26:32 +0000 Received: from localhost ([127.0.0.1]:52744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hIvRQ-0007F2-4a for submit@debbugs.gnu.org; Tue, 23 Apr 2019 09:26:32 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:40020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hIvRO-0007Em-9b for 35394@debbugs.gnu.org; Tue, 23 Apr 2019 09:26:31 -0400 Received: by mail-wr1-f50.google.com with SMTP id h4so20201080wre.7 for <35394@debbugs.gnu.org>; Tue, 23 Apr 2019 06:26:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version; bh=KFbtyZhd68nSCNRafsjnUAiwnvPu23SdiwWKyRmSW1o=; b=jYB9tvzyacpEf9MexM6FwOJ0EHq8jeHg8X66/SedZ8UflVSHKBvPzroJ+LXFEy1HpA t9xrizf5oJ1BGEZSi8ZZIqw+ZFq15NkhDJj5hIWC54nSUkzigMjs01QDKi2MdhQhflEd BLEUskTZSgRLGW12kis8BHDXDax6EwJk8VtUUqUSjpN5aRwbZ62vDcqdjnEcCfaKpQIV oSV20J1ThTbMtDSwT5hJDBfKUdLFyU2VGuiTDIJ5+VTtl+w5I7j801sNUOElvTgo+F67 HHBaFKUmADkCuMyOSooUeIuLZ1E8APIi+N9JwbL3r+64x7tptZabs+/M+0nEjuJfC1Pk CYKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version; bh=KFbtyZhd68nSCNRafsjnUAiwnvPu23SdiwWKyRmSW1o=; b=G5g3PuDEu5s/+1PckDoiFsKCE2OJFBTnXUqltQxa/ymUmtABttoCBYUHEl5QpfMlp5 rv16fQ1XiMX5UC9s9PNGDdM02Kg9PqIEYqj7JgTffQD5S/tYEjAEUIng/7My7MZ7KqmB 58AWEO673npZphExDh/fjJ2MB9bU4DoUxGJwO2u2QB6vdoWVuTyJs+8Dh/Rlwz/kiy/w V5wBGxTe5yjNLP6D1BJSNQmB6XFmw8i37IGDojleDY/mBNuT9iSd+czNeLDe+Rpt8/cn F2kl/oBvyDvJymwn7gzFFCb0ftBkYmkw+DW8C+V5h2WS5P8CUYmyGA8VUOnByGJxFm0o lCew== X-Gm-Message-State: APjAAAWXc1RJO9/IVqzTH8q/oMfnRrjVa5VDPqGG3fjHheTMgX1Ta2c4 AcaANfQmOVwPbFEoqS+0rFkU2pK63dayZg== X-Google-Smtp-Source: APXvYqycxjDDa/S1aGSy84Ktzr/BRcJjTkmV0tBa6sUXrk98BNm+hlFEvygy4oSVKaaftbIpmwtJyQ== X-Received: by 2002:a5d:52c6:: with SMTP id r6mr17855430wrv.131.1556025984235; Tue, 23 Apr 2019 06:26:24 -0700 (PDT) Received: from localhost (19.49.134.37.dynamic.jazztel.es. [37.134.49.19]) by smtp.gmail.com with ESMTPSA id z74sm26670287wmc.2.2019.04.23.06.26.23 for <35394@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Apr 2019 06:26:23 -0700 (PDT) Date: Tue, 23 Apr 2019 15:26:20 +0200 From: Miguel Message-ID: <20190423152620.2b4fa56b@gmail.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches system: Add locale to boot-parameters. * gnu/system.scm (): New locale field. (boot-parameters-locale): New accessor. (read-boot-parameters): Read locale field. (operating-system-boot-parameters): Add locale to boot-parameters form. (opeating-system-boot-parameters-file): Add locale to file-like object. * tests/boot-parameters.scm: New test file. * Makefile.am (SCM_TESTS): Add tests/boot-parameters.scm. --- Makefile.am | 1 + gnu/system.scm | 19 +++- tests/boot-parameters.scm | 232 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 248 insertions(+), 4 deletions(-) From ca81983f4fcab05472088b181406f21c80441c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= Date: Mon, 22 Apr 2019 14:44:11 +0200 Subject: [PATCH 1/3] system: Add locale to boot-parameters. * gnu/system.scm (): New locale field. (boot-parameters-locale): New accessor. (read-boot-parameters): Read locale field. (operating-system-boot-parameters): Add locale to boot-parameters form. (opeating-system-boot-parameters-file): Add locale to file-like object. * tests/boot-parameters.scm: New test file. * Makefile.am (SCM_TESTS): Add tests/boot-parameters.scm. --- Makefile.am | 1 + gnu/system.scm | 19 +++- tests/boot-parameters.scm | 232 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 248 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 99d6ed64b6..6e174588db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -347,6 +347,7 @@ SCM_TESTS = \ tests/base16.scm \ tests/base32.scm \ tests/base64.scm \ + tests/boot-parameters.scm \ tests/channels.scm \ tests/cpan.scm \ tests/cpio.scm \ diff --git a/gnu/system.scm b/gnu/system.scm index 24243eb707..385d93150c 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Meiyo Peng +;;; Copyright © 2019 Miguel Ángel Arruga Vivas ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,6 +119,7 @@ boot-parameters-kernel boot-parameters-kernel-arguments boot-parameters-initrd + boot-parameters-locale read-boot-parameters read-boot-parameters-file boot-parameters->menu-entry @@ -251,7 +253,8 @@ directly by the user." (store-mount-point boot-parameters-store-mount-point) (kernel boot-parameters-kernel) (kernel-arguments boot-parameters-kernel-arguments) - (initrd boot-parameters-initrd)) + (initrd boot-parameters-initrd) + (locale boot-parameters-locale)) (define (ensure-not-/dev device) "If DEVICE starts with a slash, return #f. This is meant to filter out @@ -329,7 +332,12 @@ file system labels." (('store ('device _) ('mount-point mount-point) _ ...) mount-point) (_ ;the old format - "/"))))) + "/"))) + + (locale + (match (assq 'locale rest) + ((_ locale) locale) + (#f #f))))) (x ;unsupported format (warning (G_ "unrecognized boot parameters at '~a'~%") (port-filename port)) @@ -973,6 +981,7 @@ parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments such as '--root' and '--load' to ." (let* ((initrd (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)) @@ -988,7 +997,8 @@ such as '--root' and '--load' to ." (initrd initrd) (bootloader-name bootloader-name) (store-device (ensure-not-/dev (file-system-device store))) - (store-mount-point (file-system-mount-point store))))) + (store-mount-point (file-system-mount-point store)) + (locale locale)))) (define (device->sexp device) "Serialize DEVICE as an sexp (really, as an object with a read syntax.)" @@ -1031,7 +1041,8 @@ being stored into the \"parameters\" file)." (store (device #$(device->sexp (boot-parameters-store-device params))) - (mount-point #$(boot-parameters-store-mount-point params)))) + (mount-point #$(boot-parameters-store-mount-point params))) + (locale #$(boot-parameters-locale params))) #:set-load-path? #f))) (define-gexp-compiler (operating-system-compiler (os ) diff --git a/tests/boot-parameters.scm b/tests/boot-parameters.scm new file mode 100644 index 0000000000..9ec1e6ddd3 --- /dev/null +++ b/tests/boot-parameters.scm @@ -0,0 +1,232 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Miguel Ángel Arruga Vivas +;;; +;;; 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 . + +;;; 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)) + +;; For whitebox testing +(define operating-system-boot-parameters + (@@ (gnu system) operating-system-boot-parameters)) + +(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-locale "es_ES.utf8") +(define %root-path "/") + +(define %grub-boot-parameters + (boot-parameters + (bootloader-name 'grub) + (label %default-label) + (root-device %default-root-device) + (kernel %default-kernel) + (kernel-arguments %default-kernel-arguments) + (initrd %default-initrd) + (store-device %default-store-device) + (store-mount-point %default-store-mount-point) + (locale %default-locale))) + +(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))) + +(define* (test-read-boot-parameters + #:key + (version 0) + (bootloader-name 'grub) + (label %default-label) + (root-device (quote-uuid %default-root-device)) + (kernel %default-kernel) + (kernel-arguments %default-kernel-arguments) + (initrd %default-initrd) + (with-store #t) + (store-device + (quote-uuid %default-store-device)) + (store-mount-point %default-store-mount-point) + (locale %default-locale)) + (define (generate-boot-parameters) + (define (sexp-or-nothing fmt val) + (cond ((eq? 'false val) (format #f fmt #f)) + (val (format #f fmt val)) + (else ""))) + (format #f "(boot-parameters ~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 #f "(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))) + (let ((str (generate-boot-parameters))) + (call-with-input-string str read-boot-parameters))) + +(test-begin "boot-parameters") + +;; XXX: +(test-assert "read, construction, mandatory fields" + (not (or (test-read-boot-parameters #:version #f) + (test-read-boot-parameters #:version 'false) + (test-read-boot-parameters #:version -1) + (test-read-boot-parameters #:version "0") + (test-read-boot-parameters #:root-device #f) + (test-read-boot-parameters #:kernel #f) + (test-read-boot-parameters #:label #f)))) + +(test-assert "read, construction, optional fields" + (and (test-read-boot-parameters #:bootloader-name #f) + (test-read-boot-parameters #:kernel-arguments #f) + (test-read-boot-parameters #:with-store #f) + (test-read-boot-parameters #:store-device #f) + (test-read-boot-parameters #:store-device 'false) + (test-read-boot-parameters #:store-mount-point #f) + (test-read-boot-parameters #:locale #f) + (test-read-boot-parameters #:bootloader-name #f #:kernel-arguments #f + #:with-store #f #:locale #f))) + +;; No default case, match error +(test-error "read, construction, missing initrd" #t + (test-read-boot-parameters #:initrd #f)) + +(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, initrd, apply concatenation" + "/a/b" + (boot-parameters-initrd + (test-read-boot-parameters #:initrd (list 'string-append "/a" "/b")))) + +(test-eq "read, bootloader-name, default value" + 'grub + (boot-parameters-bootloader-name + (test-read-boot-parameters #:bootloader-name #f))) + +(test-eq "read, kernel-arguments, default value" + '() + (boot-parameters-kernel-arguments + (test-read-boot-parameters #:kernel-arguments #f))) + +(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 #f)))) + +(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 #f)))) + +(test-assert "read, store-device #f, 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 #f))) + +(test-equal "read, no store-mount-point, default" + %root-path + (boot-parameters-store-mount-point + (test-read-boot-parameters #:store-mount-point #f))) + +(test-equal "read, no store, default store-mount-point" + %root-path + (boot-parameters-store-mount-point + (test-read-boot-parameters #:with-store #f))) + +(test-equal "from os, locale" + %default-locale + (boot-parameters-locale + (operating-system-boot-parameters %default-operating-system + %default-root-device))) + +(test-end "boot-parameters") -- 2.21.0