From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 05 22:13:45 2017 Received: (at submit) by debbugs.gnu.org; 6 Dec 2017 03:13:45 +0000 Received: from localhost ([127.0.0.1]:48414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMQ9S-0007ay-Hq for submit@debbugs.gnu.org; Tue, 05 Dec 2017 22:13:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMQ9P-0007ak-Vr for submit@debbugs.gnu.org; Tue, 05 Dec 2017 22:13:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eMQ9I-0005bf-PW for submit@debbugs.gnu.org; Tue, 05 Dec 2017 22:13:30 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:51511) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eMQ9I-0005bN-LM for submit@debbugs.gnu.org; Tue, 05 Dec 2017 22:13:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eMQ9G-0005O7-Ez for guix-patches@gnu.org; Tue, 05 Dec 2017 22:13:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eMQ9E-0005Xc-7a for guix-patches@gnu.org; Tue, 05 Dec 2017 22:13:26 -0500 Received: from tobias.gr ([2001:470:cc92::1]:52552) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eMQ9D-0005Vp-Qy for guix-patches@gnu.org; Tue, 05 Dec 2017 22:13:24 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id c8e95d34 for ; Wed, 6 Dec 2017 03:13:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=2018; bh=H6K4eBWJNVWRMxCmnaK0UVThu ZLjHvfz6NRH5oeZjM8=; b=m2cvFGrvt+2XfIZkSeLRrWR4C6HbT3ZGxSZkhhHMg Gwz05TzYtrNDA2iUOZhvvYGSrrqwpz5pMPjQk4dfKYScQYPY71ysYB7hQSJmG3oG X2sgj6fgOrdGniuE/Xg/mLJBdgMR6GvxnAHMMMM3sWGfAnk6YyV/Ybb+Jz1hEh6t zAkejcXca+56W1aqVo6ynuvzm0d0/5Rf1fxV09aMHxIXShHOlcddTqOb2Qqo6sqF KDKFzAVSW88tA4oeZy9qpGaBDtDvYiexPtrN8u82PNMBQf0Mq70DNqVeeRL/YaFj d6iskYgYMlstwjZ8jnKhWSuzVCjWIF4YsrL79a/aNa82g== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id b34baa96 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for ; Wed, 6 Dec 2017 03:13:18 +0000 (UTC) From: Tobias Geerinckx-Rice To: guix-patches@gnu.org Subject: [PATCH] =?UTF-8?q?gnu, =20doc, =20tests:=20Use=20=E2=80=98bootloade?= =?UTF-8?q?r-configuration=E2=80=99=20everywhere.?= Date: Wed, 6 Dec 2017 04:15:48 +0100 Message-Id: <20171206031548.19985-1-me@tobias.gr> X-Mailer: git-send-email 2.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) * doc/guix.texi (Proceeding with the Installation): Replace the old-style ‘grub-configuration’ with the newer ‘bootloader-configuration’ syntax. * gnu/system/examples/vm-image.tmpl: Likewise. * gnu/system/install.scm (installation-os): Likewise. * gnu/tests.scm (%simple-os): Likewise. * gnu/tests/install.scm (%minimal-os, %minimal-os-on-vda, %separate-home-os) (%separate-store-os, %raid-root-os, %encrypted-root-os, %btrfs-root-os): Likewise. * gnu/tests/nfs.scm (%base-os): Likewise. * tests/guix-system.scm (OS_BASE, make_user_config): Likewise. * tests/system.scm (%os, %os-with-mapped-device): Likewise. --- doc/guix.texi | 4 ++-- gnu/system/examples/vm-image.tmpl | 6 ++++-- gnu/system/install.scm | 5 ++++- gnu/tests.scm | 6 +++++- gnu/tests/install.scm | 29 ++++++++++++++++++++++------- gnu/tests/nfs.scm | 6 +++++- tests/guix-system.sh | 9 +++++++-- tests/system.scm | 9 +++++++-- 8 files changed, 56 insertions(+), 18 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2267fadd1..3c33a19de 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8241,8 +8241,8 @@ in particular: @itemize @item -Make sure the @code{grub-configuration} form refers to the target you -want to install GRUB on. It should mention @code{grub-bootloader} if +Make sure the @code{bootloader-configuration} form refers to the target +you want to install GRUB on. It should mention @code{grub-bootloader} if you are installing GRUB in the legacy way, or @code{grub-efi-bootloader} for newer UEFI systems. For legacy systems, the @code{target} field names a device, like @code{/dev/sda}; for UEFI systems it names a path diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 056b439c5..ce3653c8b 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -26,8 +26,10 @@ partprobe, and then 2) resizing the filesystem with resize2fs.\n")) ;; Assuming /dev/sdX is the target hard disk, and "my-root" is ;; the label of the target root file system. - (bootloader (grub-configuration (target "/dev/sda") - (terminal-outputs '(console)))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sda") + (terminal-outputs '(console)))) (file-systems (cons (file-system (device "my-root") (title 'label) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 78f2bf3a1..2e4dd05bb 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -301,7 +302,9 @@ You have been warned. Thanks for being so brave.\x1b[0m (host-name "gnu") (timezone "Europe/Paris") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/sda"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sda"))) (file-systems ;; Note: the disk image build code overrides this root file system with ;; the appropriate one. diff --git a/gnu/tests.scm b/gnu/tests.scm index 97b9cc510..0caa922fd 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix records) + #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu system) #:use-module (gnu system file-systems) @@ -206,7 +208,9 @@ the system under test." (timezone "Europe/Berlin") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (file-systems (cons (file-system (device "my-root") (title 'label) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 0e97de0a8..3ac4a579d 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,7 +61,9 @@ (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device "my-root") @@ -343,7 +346,9 @@ per %test-installed-os, this test is expensive in terms of CPU and storage.") (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vda"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vda"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device "my-root") @@ -418,7 +423,9 @@ reboot\n") (timezone "Europe/Paris") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device "my-root") @@ -476,7 +483,9 @@ partition. In particular, home directories must be correctly created (see (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons* (file-system (device "root-fs") @@ -552,7 +561,9 @@ where /gnu lives on a separate partition.") (timezone "Europe/Paris") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (initrd (lambda (file-systems . rest) ;; Add a kernel module for RAID-0 (aka. "stripe"). @@ -635,7 +646,9 @@ by 'mdadm'.") (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) ;; Note: Do not pass "console=ttyS0" so we can use our passphrase prompt ;; detection logic in 'enter-luks-passphrase'. @@ -762,7 +775,9 @@ build (current-guix) and then store a couple of full system images.") (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/vdb"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vdb"))) (kernel-arguments '("console=ttyS0")) (file-systems (cons (file-system (device "my-root") diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 889f578d0..d58cf7aef 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017 Ludovic Courtès ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (gnu tests nfs) #:use-module (gnu tests) + #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu system) #:use-module (gnu system file-systems) @@ -41,7 +43,9 @@ (timezone "Europe/Berlin") (locale "en_US.UTF-8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (file-systems %base-file-systems) (users %base-user-accounts) (packages (cons* diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 213864833..ed8563c8a 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -1,5 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +# Copyright © 2017 Tobias Geerinckx-Rice # # This file is part of GNU Guix. # @@ -134,7 +135,9 @@ OS_BASE=' (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (device "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (device "/dev/sdX"))) (file-systems (cons (file-system (device "root") (title (string->symbol "label")) @@ -205,7 +208,9 @@ make_user_config () (timezone "Europe/Paris") (locale "en_US.UTF-8") - (bootloader (grub-configuration (device "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (device "/dev/sdX"))) (file-systems (cons (file-system (device "root") (title 'label) diff --git a/tests/system.scm b/tests/system.scm index a661544a5..6a7f45c59 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +37,9 @@ (host-name "komputilo") (timezone "Europe/Berlin") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (file-systems (cons %root-fs %base-file-systems)) (users %base-user-accounts))) @@ -51,7 +54,9 @@ (host-name "komputilo") (timezone "Europe/Berlin") (locale "en_US.utf8") - (bootloader (grub-configuration (target "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/sdX"))) (mapped-devices (list %luks-device)) (file-systems (cons (file-system (inherit %root-fs) -- 2.15.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 06 03:27:06 2017 Received: (at 29587) by debbugs.gnu.org; 6 Dec 2017 08:27:06 +0000 Received: from localhost ([127.0.0.1]:48501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMV2o-0008Ok-6z for submit@debbugs.gnu.org; Wed, 06 Dec 2017 03:27:06 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:52944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMV2l-0008Ob-Kh for 29587@debbugs.gnu.org; Wed, 06 Dec 2017 03:27:04 -0500 Received: from localhost (178.113.239.105.wireless.dyn.drei.com [178.113.239.105]) by dd1012.kasserver.com (Postfix) with ESMTPSA id CE8081CA0400; Wed, 6 Dec 2017 09:26:58 +0100 (CET) Date: Wed, 6 Dec 2017 09:26:53 +0100 From: Danny Milosavljevic To: Tobias Geerinckx-Rice Subject: Re: [bug#29587] [PATCH] gnu, doc, tests: Use =?UTF-8?Q?=E2=80=98b?= =?UTF-8?Q?ootloader-configuration=E2=80=99?= everywhere. Message-ID: <20171206092648.2f42f534@scratchpost.org> In-Reply-To: <20171206031548.19985-1-me@tobias.gr> References: <20171206031548.19985-1-me@tobias.gr> X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: 1.8 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: LGTM! [...] Content analysis details: (1.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [85.13.128.8 listed in list.dnswl.org] 2.5 BODY_SINGLE_WORD Message body is only one word (no spaces) X-Debbugs-Envelope-To: 29587 Cc: 29587@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.8 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: LGTM! [...] Content analysis details: (1.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [85.13.128.8 listed in list.dnswl.org] 2.5 BODY_SINGLE_WORD Message body is only one word (no spaces) LGTM! From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 06 09:01:31 2017 Received: (at 29587-done) by debbugs.gnu.org; 6 Dec 2017 14:01:31 +0000 Received: from localhost ([127.0.0.1]:48636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMaGP-0002vN-VT for submit@debbugs.gnu.org; Wed, 06 Dec 2017 09:01:31 -0500 Received: from tobias.gr ([51.15.135.5]:54546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eMaGL-0002vB-T5 for 29587-done@debbugs.gnu.org; Wed, 06 Dec 2017 09:01:27 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id d783d42d; Wed, 6 Dec 2017 14:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=subject:to :cc:references:from:message-id:date:mime-version:in-reply-to :content-type:content-transfer-encoding; s=2018; bh=gbRL4zaipX2A 6lqi5dkJZnY7fE/dses3f/KX/310z1Y=; b=GxFaJ7EpGYX7vN1M5zROJB/krjpB 2nh2Ox6BP34psiGQWjqBgLyLunDG3LhMyWIRIuL72A/ii1bTHOD+b2CdQ7svTIkY lyOyPlF2Ke+r873mU3IwS2DjdCZo9GiVFqngtgQjiKejbJPaWslEN5J+jbIB/5Em U0zghapBUOLJZ720z4mK4xV45s28G4x4/NC1/7MfofGJeWAuiLvLmmqwpSr8dYUc avAAPm5VyuQXkeg8a+Re2qfMBAeOXL05E7Pxfh4itMNnhJPsTbQkhstYSAYDacIc 49WFBYqlTtphOCS13rxvrAdIs/58nXNlqCOxauL5H0il3CH4gdurlzHVBg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id c2549b09 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO); Wed, 6 Dec 2017 14:01:22 +0000 (UTC) Subject: =?UTF-8?Q?Re:_[bug#29587]_[PATCH]_gnu=2c_doc=2c_tests:_Use_?= =?UTF-8?Q?=e2=80=98bootloader-configuration=e2=80=99_everywhere.?= To: dannym@scratchpost.org References: <20171206031548.19985-1-me@tobias.gr> <20171206092648.2f42f534@scratchpost.org> From: Tobias Geerinckx-Rice Message-ID: Date: Wed, 6 Dec 2017 15:03:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171206092648.2f42f534@scratchpost.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 29587-done Cc: 29587-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Thanks! Pushed as fdfdecdb7ebfd05b4ae66cc5140078dbfc10fc35. Kind regards, T G-R From unknown Mon Jun 16 23:56:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 04 Jan 2018 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator