From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34226)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d1UT4-0007Yx-9o
	for guix-patches@gnu.org; Fri, 21 Apr 2017 05:03:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d1UT1-00057p-5V
	for guix-patches@gnu.org; Fri, 21 Apr 2017 05:03:06 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:33328)
	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 1d1UT1-00057j-1l
	for guix-patches@gnu.org; Fri, 21 Apr 2017 05:03:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1d1UT0-0003Fh-QH
	for guix-patches@gnu.org; Fri, 21 Apr 2017 05:03:02 -0400
Subject: bug#26544: [PATCH v2 7/8] system: Use
	operating-system-boot-parameters directly.
Resent-Message-ID: <handler.26544.B26544.149276532511676@debbugs.gnu.org>
References: <20170421022127.20524-1-dannym@scratchpost.org>
	<20170421022127.20524-8-dannym@scratchpost.org>
From: Mathieu Othacehe <m.othacehe@gmail.com>
In-reply-to: <20170421022127.20524-8-dannym@scratchpost.org>
Date: Fri, 21 Apr 2017 11:02:17 +0200
Message-ID: <867f2ekuau.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain
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: Danny Milosavljevic <dannym@scratchpost.org>
Cc: 26544@debbugs.gnu.org


LGTM!

> * gnu/system.scm (operating-system-bootcfg): Use
> operating-system-boot-parameters directly.
> ---
>  gnu/system.scm | 28 ++++------------------------
>  1 file changed, 4 insertions(+), 24 deletions(-)
>
> diff --git a/gnu/system.scm b/gnu/system.scm
> index cb166c755..013bd5356 100644
> --- a/gnu/system.scm
> +++ b/gnu/system.scm
> @@ -750,33 +750,13 @@ populate the \"old entries\" menu."
>    (mlet* %store-monad
>        ((system      (operating-system-derivation os))
>         (root-fs ->  (operating-system-root-file-system os))
> -       (store-fs -> (operating-system-store-file-system os))
> -       (label ->    (kernel->boot-label (operating-system-kernel os)))
> -       (kernel ->   (operating-system-kernel-file os))
> -       (initrd      (operating-system-initrd-file os))
>         (root-device -> (if (eq? 'uuid (file-system-title root-fs))
>                             (uuid->string (file-system-device root-fs))
>                             (file-system-device root-fs)))
> -       (entries ->  (list (menu-entry
> -                           (label label)
> -
> -                           ;; The device where the kernel and initrd live.
> -                           (device (fs->boot-device store-fs))
> -                           (device-mount-point
> -                            (file-system-mount-point store-fs))
> -
> -                           (linux kernel)
> -                           (linux-arguments
> -                            (cons* (string-append "--root=" root-device)
> -                                   #~(string-append "--system=" #$system)
> -                                   #~(string-append "--load=" #$system
> -                                                    "/boot")
> -                                   (operating-system-kernel-arguments os
> -                                                                      system
> -                                                                      root-device)))
> -                           (initrd initrd)))))
> -    (grub-configuration-file (operating-system-bootloader os) entries
> -                             #:old-entries old-entries)))
> +       (entry (operating-system-boot-parameters os system root-device)))
> +    (grub-configuration-file (operating-system-bootloader os)
> +                             (list entry)
> +                              #:old-entries old-entries)))
>  
>  (define (fs->boot-device fs)
>    "Given FS, a <file-system> object, return a value suitable for use as the