GNU bug report logs - #26544
[PATCH] system: Move "--load" and other guix-specific parameters from the grub module to the generic system module.

Previous Next

Full log

Message #68 received at 26544 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 26544 <at> debbugs.gnu.org
Subject: Re: bug#26544: [PATCH v2 7/8] system: Use
 operating-system-boot-parameters directly.
Date: Fri, 21 Apr 2017 11:02:17 +0200

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.