From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45425)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d9tb7-0001Ta-3X
	for guix-patches@gnu.org; Sun, 14 May 2017 09:30:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d9tb2-0007Jo-4U
	for guix-patches@gnu.org; Sun, 14 May 2017 09:30:09 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:41015)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1d9tb2-0007Jh-0l
	for guix-patches@gnu.org; Sun, 14 May 2017 09:30:04 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d9tb1-00074V-QL
	for guix-patches@gnu.org; Sun, 14 May 2017 09:30:03 -0400
Subject: bug#26339: [PATCH v4 2/7] bootloader: Adapt vm to new bootloader API.
Resent-Message-ID: <handler.26339.B26339.149476854327066@debbugs.gnu.org>
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
References: <20170514074803.25556-1-m.othacehe@gmail.com>
	<20170514074803.25556-3-m.othacehe@gmail.com>
Date: Sun, 14 May 2017 15:28:47 +0200
In-Reply-To: <20170514074803.25556-3-m.othacehe@gmail.com> (Mathieu Othacehe's
	message of "Sun, 14 May 2017 09:47:58 +0200")
Message-ID: <87d1bbwos0.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Mathieu Othacehe <m.othacehe@gmail.com>
Cc: 26339@debbugs.gnu.org

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

> * gnu/build/install.scm (install-boot-config): New procedure.
>   (install-grub): Move to (gnu bootloader grub).
> * gnu/build/vm.scm (register-bootcfg-root): Rename register-grub.cfg-root=
 and
>   adjust accordingly.
>   (initialize-hard-disk): Takes a bootloader-package, bootcfg, bootcfg-lo=
cation and
>   bootloader-installer procedure. Adjust accordingly.
> * gnu/system/vm.scm (qemu-image): Adjust to initialize-hard-disk.
>   (system-disk-image, system-qemu-image, system-qemu-image/shared-store):
>   Adjust to qemu-image.

[...]

> --- a/gnu/system/vm.scm
> +++ b/gnu/system/vm.scm
> @@ -46,6 +46,7 @@
>                  #:select (%guile-static-stripped))
>    #:use-module (gnu packages admin)
>=20=20
> +  #:use-module (gnu bootloader)
>    #:use-module (gnu system shadow)
>    #:use-module (gnu system pam)
>    #:use-module (gnu system linux-initrd)
> @@ -176,8 +177,9 @@ made available under the /xchg CIFS share."
>                       (disk-image-format "qcow2")
>                       (file-system-type "ext4")
>                       file-system-label
> -                     os-derivation
> -                     grub-configuration
> +                     os.drv
> +                     bootcfg.drv
> +                     bootloader

I suggest avoiding dots in identifiers (RnRS Scheme does not allow it
because it can conflict with the dot notation for pairs.)  Use a hyphen
instead.

Apart from that, if the system tests are happy after this change, fine
with me too!

Thank you,
Ludo=E2=80=99.